Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: chrome/browser/ui/webui/options2/browser_options_handler2.cc

Issue 9091015: [uber page] Convert 'Under the Hood' page to a sub-page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: code review tweak Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/options2/options_page.css ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 { "homepageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB }, 81 { "homepageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
82 { "homepageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL }, 82 { "homepageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
83 { "toolbarGroupName", IDS_OPTIONS_TOOLBAR_GROUP_NAME }, 83 { "toolbarGroupName", IDS_OPTIONS_TOOLBAR_GROUP_NAME },
84 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, 84 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
85 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR }, 85 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR },
86 { "defaultSearchGroupName", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, 86 { "defaultSearchGroupName", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME },
87 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, 87 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
88 { "instantConfirmTitle", IDS_INSTANT_OPT_IN_TITLE }, 88 { "instantConfirmTitle", IDS_INSTANT_OPT_IN_TITLE },
89 { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE }, 89 { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE },
90 { "defaultBrowserGroupName", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, 90 { "defaultBrowserGroupName", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME },
91 { "advancedGroupName", IDS_OPTIONS_ADVANCED_TAB_LABEL },
92 { "advancedOptionsButtonTitle", IDS_OPTIONS_ADVANCED_BUTTON_TITLE },
91 }; 93 };
92 94
93 RegisterStrings(localized_strings, resources, arraysize(resources)); 95 RegisterStrings(localized_strings, resources, arraysize(resources));
94 RegisterTitle(localized_strings, "browserPage", 96 RegisterTitle(localized_strings, "browserPage",
95 IDS_OPTIONS_GENERAL_TAB_LABEL); 97 IDS_OPTIONS_GENERAL_TAB_LABEL);
96 98
97 localized_strings->SetString("defaultSearchGroupLabel", 99 localized_strings->SetString("defaultSearchGroupLabel",
98 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, 100 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION,
99 l10n_util::GetStringUTF16(IDS_OMNIBOX_LEARN_MORE_URL))); 101 l10n_util::GetStringUTF16(IDS_OMNIBOX_LEARN_MORE_URL)));
100 localized_strings->SetString("instantPrefAndWarning", 102 localized_strings->SetString("instantPrefAndWarning",
101 l10n_util::GetStringFUTF16(IDS_INSTANT_PREF_WITH_WARNING, 103 l10n_util::GetStringFUTF16(IDS_INSTANT_PREF_WITH_WARNING,
102 l10n_util::GetStringUTF16(IDS_INSTANT_LEARN_MORE_URL))); 104 l10n_util::GetStringUTF16(IDS_INSTANT_LEARN_MORE_URL)));
103 localized_strings->SetString("instantLearnMoreLink", 105 localized_strings->SetString("instantLearnMoreLink",
104 ASCIIToUTF16(browser::InstantLearnMoreURL().spec())); 106 ASCIIToUTF16(browser::InstantLearnMoreURL().spec()));
105 localized_strings->SetString("defaultBrowserUnknown", 107 localized_strings->SetString("defaultBrowserUnknown",
106 l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, 108 l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
107 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 109 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
108 localized_strings->SetString("defaultBrowserUseAsDefault", 110 localized_strings->SetString("defaultBrowserUseAsDefault",
109 l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT, 111 l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT,
110 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 112 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
111 localized_strings->SetString("autoLaunchText", 113 localized_strings->SetString("autoLaunchText",
112 l10n_util::GetStringFUTF16(IDS_AUTOLAUNCH_TEXT, 114 l10n_util::GetStringFUTF16(IDS_AUTOLAUNCH_TEXT,
113 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); 115 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
116 localized_strings->SetString("advancedGroupDescription",
117 l10n_util::GetStringFUTF16(IDS_OPTIONS_ADVANCED_GROUP_DESCRIPTION,
118 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
114 } 119 }
115 120
116 void BrowserOptionsHandler::RegisterMessages() { 121 void BrowserOptionsHandler::RegisterMessages() {
117 web_ui()->RegisterMessageCallback("becomeDefaultBrowser", 122 web_ui()->RegisterMessageCallback("becomeDefaultBrowser",
118 base::Bind(&BrowserOptionsHandler::BecomeDefaultBrowser, 123 base::Bind(&BrowserOptionsHandler::BecomeDefaultBrowser,
119 base::Unretained(this))); 124 base::Unretained(this)));
120 web_ui()->RegisterMessageCallback("setDefaultSearchEngine", 125 web_ui()->RegisterMessageCallback("setDefaultSearchEngine",
121 base::Bind(&BrowserOptionsHandler::SetDefaultSearchEngine, 126 base::Bind(&BrowserOptionsHandler::SetDefaultSearchEngine,
122 base::Unretained(this))); 127 base::Unretained(this)));
123 web_ui()->RegisterMessageCallback("removeStartupPages", 128 web_ui()->RegisterMessageCallback("removeStartupPages",
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 entry->SetString("displayURL", match.contents); 572 entry->SetString("displayURL", match.contents);
568 entry->SetString("url", match.destination_url.spec()); 573 entry->SetString("url", match.destination_url.spec());
569 suggestions.Append(entry); 574 suggestions.Append(entry);
570 } 575 }
571 576
572 web_ui()->CallJavascriptFunction( 577 web_ui()->CallJavascriptFunction(
573 "BrowserOptions.updateAutocompleteSuggestions", suggestions); 578 "BrowserOptions.updateAutocompleteSuggestions", suggestions);
574 } 579 }
575 580
576 } // namespace options2 581 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/options_page.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698