Move "display" settings button to "Device" section rather than an independent section.

BUG=143291


Review URL: https://chromiumcodereview.appspot.com/10825417

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

8 files changed, 17 insertions, 21 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 802dc3a..85ed8aa 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13847,9 +13847,6 @@ Press any key to continue exploring.
       <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY">
         Accessibility
       </message>
-      <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_DISPLAY">
-        Display
-      </message>
       <message name="IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION" desc="In the settings tab, the text next to the timezone combobox.">
         Time zone:
       </message>
@@ -13991,6 +13988,9 @@ Press any key to continue exploring.
       <message name="IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION" desc="In the settings tab, the text next to the checkbox for virtual keyboard.">
         Enable virtual keyboard
       </message>
+      <message name="IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL" desc="Label for the button opening display settings tab.">
+        Display settings
+      </message>
       <message name="IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_TAB_TITLE" desc="Title for the display settings tab.">
         Manage displays
       </message>
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 3f69dd2..ab5cd46 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -98,6 +98,12 @@
         <button id="keyboard-settings-button"
             i18n-content="keyboardSettingsButtonTitle">
         </button>
+        <!-- By default, the display settings are hidden.  They are only visible
+             if more than one display is found. -->
+        <span id="display-options-section" hidden>
+          <button id="display-options" i18n-content="displayOptions">
+          </button>
+        </span>
       </div>
     </div>
   </section>
@@ -265,16 +271,6 @@
     </div>
   </section>
 <if expr="pp_ifdef('chromeos')">
-  <!-- By default, the display section is hidden.  It is only visible if
-       more than one display is found. -->
-  <section id="display-options-section" hidden>
-    <h3 i18n-content="displayOptionsTitle"></h3>
-    <div class="settings-row">
-      <button id="display-options-button"
-          i18n-content="displayOptionsButton">
-      </button>
-    </div>
-  </section>
   <!-- By default, the bluetooth section is hidden.  It is only visible if a
        bluetooth adapter is discovered -->
   <section id="bluetooth-devices" hidden>
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index ddce362..b473646 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -450,11 +450,11 @@ cr.define('options', function() {
 
       // Display management section (CrOS only).
       if (cr.isChromeOS) {
-        $('display-options-button').onclick = function(event) {
+        $('display-options').onclick = function(event) {
           OptionsPage.navigateToPage('display');
           chrome.send('coreOptionsUserMetricsAction',
                       ['Options_Display']);
-        }
+        };
       }
 
       // Background mode section.
diff --git a/chrome/browser/resources/options/chromeos/display_options.css b/chrome/browser/resources/options/chromeos/display_options.css
index 7d32475..c2edee0 100644
--- a/chrome/browser/resources/options/chromeos/display_options.css
+++ b/chrome/browser/resources/options/chromeos/display_options.css
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
-#display-options {
+#display-options-page {
   background-color: rgb(240, 240, 240);
 }
 
diff --git a/chrome/browser/resources/options/chromeos/display_options.html b/chrome/browser/resources/options/chromeos/display_options.html
index 3b865c8..eb54043 100644
--- a/chrome/browser/resources/options/chromeos/display_options.html
+++ b/chrome/browser/resources/options/chromeos/display_options.html
@@ -1,4 +1,4 @@
-<div id="display-options" class="page" hidden>
+<div id="display-options-page" class="page" hidden>
   <div class="close-button"></div>
   <h1 i18n-content="displayOptionsPage"></h1>
   <div class="content-area" id="display-options-content-area">
diff --git a/chrome/browser/resources/options/chromeos/display_options.js b/chrome/browser/resources/options/chromeos/display_options.js
index b663d94..438ab2d 100644
--- a/chrome/browser/resources/options/chromeos/display_options.js
+++ b/chrome/browser/resources/options/chromeos/display_options.js
@@ -30,7 +30,7 @@ cr.define('options', function() {
   function DisplayOptions() {
     OptionsPage.call(this, 'display',
                      loadTimeData.getString('displayOptionsPageTabTitle'),
-                     'display-options');
+                     'display-options-page');
     this.mirroring_ = false;
     this.focusedIndex_ = null;
     this.displays_ = [];
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index 487c517..509b4392 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -135,7 +135,7 @@ function load() {
                                 BrowserOptions.getInstance());
     OptionsPage.registerOverlay(DisplayOptions.getInstance(),
                                 BrowserOptions.getInstance(),
-                                [$('display-options-button')]);
+                                [$('display-options')]);
     OptionsPage.registerOverlay(KeyboardOverlay.getInstance(),
                                 BrowserOptions.getInstance(),
                                 [$('keyboard-settings-button')]);
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 558f49a..1e51e83 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -178,8 +178,8 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
 #endif
     { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
 #if defined(OS_CHROMEOS)
-    { "displayOptionsButton", IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_TAB_TITLE },
-    { "displayOptionsTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DISPLAY },
+    { "displayOptions",
+      IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL },
 #endif
     { "downloadLocationAskForSaveLocation",
       IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION },