Add new instant extended specific pref.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 31 matching lines @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #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"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 324 matching lines @@
                 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE);
   RegisterCloudPrintValues(values);
 
   values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
   string16 omnibox_url = ASCIIToUTF16(chrome::kOmniboxLearnMoreURL);
   values->SetString(
       "defaultSearchGroupLabel",
       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)
   const chromeos::User* user = chromeos::UserManager::Get()->GetLoggedInUser();
   values->SetString("username", user ? user->email() : std::string());
 #endif
 
   // Pass along sync status early so it will be available during page init.
   values->Set("syncData", GetSyncStateDictionary().release());
 
@@ skipping 1012 matching lines @@
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   StringValue label(label_str);
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setupProxySettingsSection", disabled, label);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options