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

Unified Diff: chrome/browser/dom_ui/options/browser_options_handler.cc

Issue 4245002: Add instant to tabbed options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: smorgan review Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_handler.cc ('k') | chrome/browser/resources/dom_ui.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/options/browser_options_handler.cc
diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc
index a46adfe54163bd1ceb97026fbbb8bbe59d26e337..1528e352447d4407823f9df70462ca89a41f3118 100644
--- a/chrome/browser/dom_ui/options/browser_options_handler.cc
+++ b/chrome/browser/dom_ui/options/browser_options_handler.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/custom_home_pages_table_model.h"
#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
#include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
+#include "chrome/browser/instant/instant_confirm_dialog.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/options_window.h"
@@ -71,6 +72,12 @@ void BrowserOptionsHandler::GetLocalizedValues(
l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME));
localized_strings->SetString("defaultSearchManageEnginesLink",
l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES_LINK));
+ localized_strings->SetString("instantName",
+ l10n_util::GetStringUTF16(IDS_INSTANT_PREF));
+ localized_strings->SetString("instantWarningText",
+ l10n_util::GetStringUTF16(IDS_INSTANT_PREF_WARNING));
+ localized_strings->SetString("instantLearnMoreLink",
+ ASCIIToUTF16(browser::kInstantLearnMoreURL));
localized_strings->SetString("defaultBrowserGroupName",
l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME));
localized_strings->SetString("defaultBrowserUnknown",
« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_handler.cc ('k') | chrome/browser/resources/dom_ui.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698