Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java

Issue 29341117: Issue 3766 - Restore default ABP bookmarks
Left Patch Set: Created May 10, 2016, 10:41 a.m.
Right Patch Set: Removing default bookmarks Created May 10, 2016, 3:36 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « mobile/android/base/strings.xml.in ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*- 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
2 * This Source Code Form is subject to the terms of the Mozilla Public 2 * This Source Code Form is subject to the terms of the Mozilla Public
3 * License, v. 2.0. If a copy of the MPL was not distributed with this 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 package org.mozilla.gecko.tests; 6 package org.mozilla.gecko.tests;
7 7
8 import android.content.res.Resources; 8 import android.content.res.Resources;
9 9
10 import org.mozilla.gecko.R; 10 import org.mozilla.gecko.R;
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 private StringHelper(final Resources res) { 297 private StringHelper(final Resources res) {
298 298
299 OK = res.getString(R.string.button_ok); 299 OK = res.getString(R.string.button_ok);
300 CANCEL = res.getString(R.string.button_cancel); 300 CANCEL = res.getString(R.string.button_cancel);
301 CLEAR = res.getString(R.string.button_clear); 301 CLEAR = res.getString(R.string.button_clear);
302 302
303 // Note: DEFAULT_BOOKMARKS_TITLES.length == DEFAULT_BOOKMARKS_URLS.lengt h 303 // Note: DEFAULT_BOOKMARKS_TITLES.length == DEFAULT_BOOKMARKS_URLS.lengt h
304 DEFAULT_BOOKMARKS_TITLES = new String[] { 304 DEFAULT_BOOKMARKS_TITLES = new String[] {
305 res.getString(R.string.bookmarkdefaults_title_aboutfirefox), 305 res.getString(R.string.bookmarkdefaults_title_aboutfirefox),
306 res.getString(R.string.bookmarkdefaults_title_adblockplus), 306 res.getString(R.string.bookmarkdefaults_title_adblockplus),
307 res.getString(R.string.bookmarkdefaults_title_acceptableads) 307 res.getString(R.string.bookmarkdefaults_title_acceptableads),
308 res.getString(R.string.bookmarkdefaults_title_adblockbrowserbeta community)
308 }; 309 };
309 DEFAULT_BOOKMARKS_URLS = new String[] { 310 DEFAULT_BOOKMARKS_URLS = new String[] {
310 res.getString(R.string.bookmarkdefaults_url_aboutfirefox), 311 res.getString(R.string.bookmarkdefaults_url_aboutfirefox),
311 res.getString(R.string.bookmarkdefaults_url_adblockplus), 312 res.getString(R.string.bookmarkdefaults_url_adblockplus),
312 res.getString(R.string.bookmarkdefaults_url_acceptableads) 313 res.getString(R.string.bookmarkdefaults_url_acceptableads),
314 res.getString(R.string.bookmarkdefaults_url_adblockbrowserbetaco mmunity)
313 }; 315 };
314 DEFAULT_BOOKMARKS_COUNT = DEFAULT_BOOKMARKS_TITLES.length; 316 DEFAULT_BOOKMARKS_COUNT = DEFAULT_BOOKMARKS_TITLES.length;
315 317
316 // About pages 318 // About pages
317 ABOUT_FIREFOX_URL = res.getString(R.string.bookmarkdefaults_url_aboutfir efox); 319 ABOUT_FIREFOX_URL = res.getString(R.string.bookmarkdefaults_url_aboutfir efox);
318 320
319 // Context Menu item strings 321 // Context Menu item strings
320 CONTEXT_MENU_OPEN_IN_NEW_TAB = res.getString(R.string.contextmenu_open_n ew_tab); 322 CONTEXT_MENU_OPEN_IN_NEW_TAB = res.getString(R.string.contextmenu_open_n ew_tab);
321 CONTEXT_MENU_OPEN_IN_PRIVATE_TAB = res.getString(R.string.contextmenu_op en_private_tab); 323 CONTEXT_MENU_OPEN_IN_PRIVATE_TAB = res.getString(R.string.contextmenu_op en_private_tab);
322 CONTEXT_MENU_EDIT = res.getString(R.string.contextmenu_top_sites_edit); 324 CONTEXT_MENU_EDIT = res.getString(R.string.contextmenu_top_sites_edit);
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 * @param javascriptUrl to load. 541 * @param javascriptUrl to load.
540 * @return URL with harness wrapper. 542 * @return URL with harness wrapper.
541 */ 543 */
542 public String getHarnessUrlForJavascript(String javascriptUrl) { 544 public String getHarnessUrlForJavascript(String javascriptUrl) {
543 // We include a slug to make sure we never cache the harness. 545 // We include a slug to make sure we never cache the harness.
544 return ROBOCOP_JS_HARNESS_URL + 546 return ROBOCOP_JS_HARNESS_URL +
545 "?slug=" + System.currentTimeMillis() + 547 "?slug=" + System.currentTimeMillis() +
546 "&path=" + javascriptUrl; 548 "&path=" + javascriptUrl;
547 } 549 }
548 } 550 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld