Use class instead of attribute for hide-menu

Works around webkit bug 12519

BUG=73047
TEST=manual

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

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

3 files changed, 10 insertions, 7 deletions

diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index dc69759..a913213 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -44,7 +44,11 @@ function load() {
 
   var menuOffPattern = /(^\?|&)menu=off($|&)/;
   var menuDisabled = menuOffPattern.test(window.location.search);
-  document.documentElement.setAttribute('hide-menu', menuDisabled);
+  // document.documentElement.setAttribute('hide-menu', menuDisabled);
+  // We can't use an attribute on the html element because of webkit bug
+  // 12519. Instead, we add a class.
+  if (menuDisabled)
+    document.documentElement.classList.add('hide-menu');
 
   localStrings = new LocalStrings();
 
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 637dfbe..fda91dc 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -93,7 +93,7 @@ html[dir='rtl'] .close-subpage {
   left: 0;
 }
 
-html[hide-menu=true] .close-subpage {
+html.hide-menu .close-subpage {
   display: none
 }
 
@@ -151,7 +151,6 @@ html[toolkit=views] .button-strip {
   background: -webkit-linear-gradient(rgba(234, 238, 243, 0.2), #eaeef3),
               -webkit-linear-gradient(left, #eaeef3, #eaeef3 97%, #d3d7db);
   bottom: 0;
-  display: none;
   left: 0;
   top: 0;
   width: 266px;
@@ -166,8 +165,8 @@ html[dir='rtl'] #navbar-container {
   right: 0;
 }
 
-html[hide-menu=false] #navbar-container {
-  display: block;
+html.hide-menu #navbar-container {
+  display: none;
 }
 
 #navbar-container > ul {
@@ -212,7 +211,7 @@ html[hide-menu=false] #navbar-container {
   z-index: 1;
 }
 
-html[hide-menu=true] #mainview {
+html.hide-menu #mainview {
   -webkit-padding-start: 0;
 }
 
diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js
index 4d563ab..4c93cf2 100644
--- a/chrome/browser/resources/options/options_page.js
+++ b/chrome/browser/resources/options/options_page.js
@@ -117,7 +117,7 @@ cr.define('options', function() {
       if (!page.parentPage && isRootPageLocked)
         continue;
       page.visible = name == pageName ||
-          (document.documentElement.getAttribute('hide-menu') != 'true' &&
+          (!document.documentElement.classList.contains('hide-menu') &&
            page.isAncestorOfPage(targetPage));
     }