Add instant to tabbed options.

It needs to launch a confirmation dialog, which it doesn't do yet.

BUG=61042
TEST=manual

Review URL: http://codereview.chromium.org/4245002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64966 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 48 insertions, 19 deletions

diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index 1454085..bb7bb88 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -58,8 +58,6 @@ void AdvancedOptionsHandler::GetLocalizedValues(
 
   localized_strings->SetString("privacyLearnMoreURL",
       l10n_util::GetStringUTF16(IDS_LEARN_MORE_PRIVACY_URL));
-  localized_strings->SetString("privacyLearnMoreLabel",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_LEARN_MORE_LABEL));
   localized_strings->SetString("downloadLocationGroupName",
       l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME));
   localized_strings->SetString("downloadLocationBrowseButton",
@@ -145,8 +143,6 @@ void AdvancedOptionsHandler::GetLocalizedValues(
   localized_strings->SetString("chromeAppsEnableBackgroundMode",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_CHROME_APPS_ENABLE_BACKGROUND_MODE));
-  localized_strings->SetString("chromeAppsLearnMoreBackgroundModeLabel",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_LEARN_MORE_LABEL));
   localized_strings->SetString("chromeAppsLearnMoreBackgroundModeURL",
       l10n_util::GetStringUTF16(IDS_LEARN_MORE_BACKGROUND_MODE_URL));
 #if !defined(OS_CHROMEOS)
diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc
index a46adfe..1528e35 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",
diff --git a/chrome/browser/resources/dom_ui.css b/chrome/browser/resources/dom_ui.css
index 13e3756..9eba4bc 100644
--- a/chrome/browser/resources/dom_ui.css
+++ b/chrome/browser/resources/dom_ui.css
@@ -3,30 +3,37 @@ body {
   color:black;

   margin:10px;

 }

+

 .header {

   overflow:auto;

   clear:both;

 }

+

 .header .logo {

   float:left;

 }

+

 .header .form {

   float:left;

   margin-top:22px;

   margin-left:12px;

 }

+

 html[dir='rtl'] .logo {

   float:right;

 }

+

 html[dir='rtl'] .form {

   float:right;

   margin-right:12px;

 }

+

 .page-navigation {

   padding:8px;

   background-color:#ebeff9;

   margin-right:4px;

 }

+

 .footer {

   height:24px;

-}
\ No newline at end of file
+}

diff --git a/chrome/browser/resources/new_new_tab.css b/chrome/browser/resources/new_new_tab.css
index 4ab7852..fca01f6d 100644
--- a/chrome/browser/resources/new_new_tab.css
+++ b/chrome/browser/resources/new_new_tab.css
@@ -197,11 +197,6 @@ html[dir=rtl] .item {
   max-width: 300px;
 }
 
-.hbox {
-  display: -webkit-box;
-  -webkit-box-orient: horizontal;
-}
-
 .foreign-session-client {
   float: left;
   max-width: 114px; /* Selected so that we can fit 5 items in EN-US */
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index d2726a6..c317349 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -10,7 +10,7 @@
             i18n-content="privacyClearDataButton"></button>
       </div>
       <div i18n-content="disableServices" class="disable-services-div"></div>
-      <div><a target="_blank" i18n-content="privacyLearnMoreLabel"
+      <div><a target="_blank" i18n-content="learnMore"
           i18n-values="href:privacyLearnMoreURL"></a></div>
       <label class="checkbox">
         <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabled"
@@ -180,7 +180,7 @@
       </label>
       <div>
         <a target="_blank"
-            i18n-content="chromeAppsLearnMoreBackgroundModeLabel"
+            i18n-content="learnMore"
             i18n-values="href:chromeAppsLearnMoreBackgroundModeURL"></a>
       </div>
     </div>
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 7950913..2e8c650 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -64,13 +64,27 @@
   </section>
   <section>
     <h3 i18n-content="defaultSearchGroupName"></h3>
-    <div id="defaultSearchEngineGroup">
-      <select id="defaultSearchEngine"
-          onchange="BrowserOptions.getInstance().setDefaultSearchEngine()">
-      </select>
-      <button id="defaultSearchManageEnginesButton"
-          i18n-content="defaultSearchManageEnginesLink"></button>
-    </div>
+      <div id="defaultSearchEngineGroup">
+        <div>
+          <select id="defaultSearchEngine"
+              onchange="BrowserOptions.getInstance().setDefaultSearchEngine()">
+          </select>
+          <button id="defaultSearchManageEnginesButton"
+              i18n-content="defaultSearchManageEnginesLink"></button>
+        </div>
+        <!-- TODO(estade): toggling this needs to launch the warning dialog -->
+        <label class="checkbox" id="instantOption">
+          <!-- TODO(estade): metric? -->
+          <input type="checkbox" id="instantEnableCheckbox"
+                 pref="instant.enabled">
+          <span i18n-content="instantName"></span>
+        </label>
+        <div class="suboption">
+          <span i18n-content="instantWarningText"></span>
+          <a target="_blank" i18n-values="href:instantLearnMoreLink"
+             i18n-content="learnMore"></a>
+        </div>
+      </div>
   </section>
 <if expr="not pp_ifdef('chromeos')">
   <section>
diff --git a/chrome/browser/resources/options/browser_options_page.css b/chrome/browser/resources/options/browser_options_page.css
index b2c1f27..a68cf78 100644
--- a/chrome/browser/resources/options/browser_options_page.css
+++ b/chrome/browser/resources/options/browser_options_page.css
@@ -9,6 +9,12 @@
 
 #defaultSearchEngineGroup {
   display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+
+#defaultSearchEngineGroup > div {
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
 }
 
 #defaultSearchEngine {
@@ -21,6 +27,10 @@
   -webkit-margin-start: 10px;
 }
 
+#instantOption {
+  margin-bottom: 0px;
+}
+
 #defaultBrowserState {
   color: #880000;
 }