Add new instant extended specific pref.

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index a99f243bd5a6c95d07e2dc45b198d70aa7daa085..7c42eeeb0ae215ba0e02620c24976d7425467cb3 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -49,6 +49,7 @@
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/options/options_util.h"
+#include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
@@ -393,10 +394,17 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
       l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url));
 
   string16 instant_learn_more_url = ASCIIToUTF16(chrome::kInstantLearnMoreURL);
+  int instant_message_id = IDS_INSTANT_PREF_WITH_WARNING;
+  if (chrome::search::IsInstantExtendedAPIEnabled(
+      Profile::FromWebUI(web_ui()))) {

[dhollowa, 2012/12/07 19:50:38]

nit: indent

[MAD, 2012/12/07 19:56:51]

What's wrong? Isn't this supposed to be double indent? It's part of the previous
line...

[dhollowa, 2012/12/07 20:05:13]

Function arguments should indent 4-spaces from start of function name.

[Peter Kasting, 2012/12/07 21:50:08]

Negative, ghostrider; mad's current indenting is correct.

[dhollowa, 2012/12/07 21:56:12]

Really?  Wow, sorry. 
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Function_Calls
seems pretty clear to me.  The discussion on wrapping conditionals is only for
sequential clauses, a && b for example.  Can you point me to the section that
applies here?

+    instant_message_id = IDS_INSTANT_EXTENDED_PREF_WITH_WARNING;
+    values->SetBoolean("instant_extended", true);
+  } else {
+    values->SetBoolean("instant_extended", false);
+  }
   values->SetString(
       "instantPrefAndWarning",
-      l10n_util::GetStringFUTF16(IDS_INSTANT_PREF_WITH_WARNING,
-                                 instant_learn_more_url));
+      l10n_util::GetStringFUTF16(instant_message_id, instant_learn_more_url));
   values->SetString("instantLearnMoreLink", instant_learn_more_url);
 
 #if defined(OS_CHROMEOS)