Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Side by Side Diff: chrome/browser/resources/options/options_page.js

Issue 6240010: retry r71405: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('options', function() { 5 cr.define('options', function() {
6 ///////////////////////////////////////////////////////////////////////////// 6 /////////////////////////////////////////////////////////////////////////////
7 // OptionsPage class: 7 // OptionsPage class:
8 8
9 /** 9 /**
10 * Base class for options page. 10 * Base class for options page.
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 var containerId = 'subpage-sheet-container-' + nestingLevel; 492 var containerId = 'subpage-sheet-container-' + nestingLevel;
493 $(containerId).classList.remove('hidden'); 493 $(containerId).classList.remove('hidden');
494 } 494 }
495 495
496 // The managed prefs banner is global, so after any visibility change 496 // The managed prefs banner is global, so after any visibility change
497 // update it based on the topmost page, not necessarily this page. 497 // update it based on the topmost page, not necessarily this page.
498 // (e.g., if an ancestor is made visible after a child). 498 // (e.g., if an ancestor is made visible after a child).
499 OptionsPage.updateManagedBannerVisibility(); 499 OptionsPage.updateManagedBannerVisibility();
500 500
501 // Recent webkit change no longer allows url change from "chrome://". 501 // Recent webkit change no longer allows url change from "chrome://".
502 window.history.pushState({pageName: this.name}, this.title); 502 window.history.pushState({pageName: this.name}, this.title,
503 '/' + this.name);
503 } 504 }
504 if (this.tab) { 505 if (this.tab) {
505 this.tab.classList.add('navbar-item-selected'); 506 this.tab.classList.add('navbar-item-selected');
506 } 507 }
507 } else { 508 } else {
508 this.pageDiv.classList.add('hidden'); 509 this.pageDiv.classList.add('hidden');
509 if (this.isOverlay) { 510 if (this.isOverlay) {
510 $('overlay').classList.add('hidden'); 511 $('overlay').classList.add('hidden');
511 } else if (this.parentPage) { 512 } else if (this.parentPage) {
512 var nestingLevel = this.nestingLevel; 513 var nestingLevel = this.nestingLevel;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 OptionsPage.showOverlay(hash); 576 OptionsPage.showOverlay(hash);
576 }, 577 },
577 }; 578 };
578 579
579 // Export 580 // Export
580 return { 581 return {
581 OptionsPage: OptionsPage 582 OptionsPage: OptionsPage
582 }; 583 };
583 584
584 }); 585 });
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/browser_render_process_host.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698