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

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

Issue 5790001: Remove parent window (dangling in background) for chrome://settings when invoked at OOBE screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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
« no previous file with comments | « chrome/browser/resources/options/options_page.css ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // Update the visibility attribute for main pages. 63 // Update the visibility attribute for main pages.
64 for (var name in this.registeredPages) { 64 for (var name in this.registeredPages) {
65 var page = this.registeredPages[name]; 65 var page = this.registeredPages[name];
66 page.visible = name == pageName; 66 page.visible = name == pageName;
67 } 67 }
68 68
69 // Update the visibility attribute for sub-pages. 69 // Update the visibility attribute for sub-pages.
70 for (var name in this.registeredSubPages) { 70 for (var name in this.registeredSubPages) {
71 var pageInfo = this.registeredSubPages[name]; 71 var pageInfo = this.registeredSubPages[name];
72 var match = name == pageName; 72 var match = name == pageName;
73 if (match) 73 if (match && document.documentElement.getAttribute('hide-menu') != 'true')
74 pageInfo.parentPage.visible = true; 74 pageInfo.parentPage.visible = true;
75 pageInfo.page.visible = match; 75 pageInfo.page.visible = match;
76 } 76 }
77 77
78 // Notify main pages if they were shown. 78 // Notify main pages if they were shown.
79 for (var name in this.registeredPages) { 79 for (var name in this.registeredPages) {
80 var page = this.registeredPages[name]; 80 var page = this.registeredPages[name];
81 if (name == pageName && page.didShowPage) 81 if (name == pageName && page.didShowPage)
82 page.didShowPage(); 82 page.didShowPage();
83 } 83 }
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 OptionsPage.showOverlay(hash); 349 OptionsPage.showOverlay(hash);
350 }, 350 },
351 }; 351 };
352 352
353 // Export 353 // Export
354 return { 354 return {
355 OptionsPage: OptionsPage 355 OptionsPage: OptionsPage
356 }; 356 };
357 357
358 }); 358 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options_page.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698