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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/settings/SettingsScreen.js

Issue 2702523003: [DevTools] Continue GlassPane refactoring. (Closed)
Patch Set: element Created 3 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 /** 64 /**
65 * @param {string=} name 65 * @param {string=} name
66 */ 66 */
67 static _showSettingsScreen(name) { 67 static _showSettingsScreen(name) {
68 var settingsScreen = 68 var settingsScreen =
69 /** @type {!Settings.SettingsScreen} */ (self.runtime.sharedInstance(Set tings.SettingsScreen)); 69 /** @type {!Settings.SettingsScreen} */ (self.runtime.sharedInstance(Set tings.SettingsScreen));
70 if (settingsScreen.isShowing()) 70 if (settingsScreen.isShowing())
71 return; 71 return;
72 var dialog = new UI.Dialog(); 72 var dialog = new UI.Dialog();
73 dialog.addCloseButton(); 73 dialog.addCloseButton();
74 settingsScreen.show(dialog.element); 74 settingsScreen.show(dialog.contentElement);
75 dialog.show(); 75 dialog.showDialog();
76 settingsScreen._selectTab(name || 'preferences'); 76 settingsScreen._selectTab(name || 'preferences');
77 } 77 }
78 78
79 /** 79 /**
80 * @override 80 * @override
81 * @param {string} locationName 81 * @param {string} locationName
82 * @return {?UI.ViewLocation} 82 * @return {?UI.ViewLocation}
83 */ 83 */
84 resolveLocation(locationName) { 84 resolveLocation(locationName) {
85 return this._tabbedLocation; 85 return this._tabbedLocation;
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 return; 545 return;
546 var settings = extension.descriptor()['settings']; 546 var settings = extension.descriptor()['settings'];
547 if (settings && settings.indexOf(setting.name) !== -1) { 547 if (settings && settings.indexOf(setting.name) !== -1) {
548 InspectorFrontendHost.bringToFront(); 548 InspectorFrontendHost.bringToFront();
549 Settings.SettingsScreen._showSettingsScreen(extension.descriptor()['id'] ); 549 Settings.SettingsScreen._showSettingsScreen(extension.descriptor()['id'] );
550 success = true; 550 success = true;
551 } 551 }
552 } 552 }
553 } 553 }
554 }; 554 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698