Added support for ?menu=off search pattern in chrome://settings/... URLs.

BUG=http://crosbug.com/3062
TEST=Manual

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

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

5 files changed, 18 insertions, 3 deletions

diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc
index 4b80b9c..652b3cd 100644
--- a/chrome/browser/chromeos/login/network_selection_view.cc
+++ b/chrome/browser/chromeos/login/network_selection_view.cc
@@ -399,7 +399,8 @@ bool NetworkSelectionView::IsContinueEnabled() const {
 void NetworkSelectionView::LinkActivated(views::Link* source, int) {
   if (source == proxy_settings_link_) {
     if (!proxy_settings_dialog_.get()) {
-      static const char kProxySettingsURL[] = "chrome://settings/proxy";
+      static const char kProxySettingsURL[] =
+          "chrome://settings/proxy?menu=off";
       proxy_settings_dialog_.reset(new LoginHtmlDialog(
           this,
           GetNativeWindow(),
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc
index 0ebeba8..882fdc9 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -198,7 +198,7 @@ OptionsUI::~OptionsUI() {
   for (std::vector<DOMMessageHandler*>::iterator iter = handlers_.begin();
        iter != handlers_.end();
        ++iter) {
-    reinterpret_cast<OptionsPageUIHandler*>(*iter)->Uninitialize();
+    static_cast<OptionsPageUIHandler*>(*iter)->Uninitialize();
   }
 }
 
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index d6be2f9f..febc7f2 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -139,6 +139,10 @@ var SyncOptions = options.SyncOptions;
 function load() {
   var start = new Date();
 
+  var menuOffPattern = /(^\?|&)menu=off($|&)/;
+  var menuDisabled = menuOffPattern.test(window.location.search);
+  document.documentElement.setAttribute('hide-menu', menuDisabled);
+
   localStrings = new LocalStrings();
 
   if (cr.isChromeOS) {
@@ -230,6 +234,7 @@ function load() {
       OptionsPage.showTab(event.srcElement);
     }
   }
+
   var end = new Date();
   var total = end - start;
   console.log('time took to run load():'+ total);
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index c5836ce..847a3f9 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -88,6 +88,7 @@ html[dir='rtl'] #close-overlay {
   position: relative;
   width: 250px;
   z-index: 2;
+  display: none;
 }
 
 html[dir='rtl'] #navbar-container {
@@ -105,6 +106,10 @@ html[dir='rtl'] #navbar-container {
                                to(#f3f3f3));
 }
 
+html[hide-menu=false] #navbar-container {
+  display: block;
+}
+
 #navbar-container > hr {
   -webkit-margin-start: 35%;
   background-color: #dbdbdb;
@@ -157,6 +162,10 @@ html[dir='rtl'] .navbar-item-selected {
   z-index: 1;
 }
 
+html[hide-menu=true] #mainview {
+  -webkit-padding-start: 0;
+}
+
 #mainview-content {
   width: 550px;
   padding: 0 24px;
diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js
index bb560f3..4afad5b 100644
--- a/chrome/browser/resources/options/options_page.js
+++ b/chrome/browser/resources/options/options_page.js
@@ -141,7 +141,7 @@ cr.define('options', function() {
 
   /**
    * Registers a new Overlay page.
-   * @param {OptionsPage} page Page to register, must be a class derviced from
+   * @param {OptionsPage} page Page to register, must be a class derived from
    * OptionsPage.
    */
   OptionsPage.registerOverlay = function(page) {