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

Unified Diff: chrome/browser/extensions/api/tabs/tabs_api.cc

Issue 12386038: Revert 185358 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/tabs/tabs_api.cc
===================================================================
--- chrome/browser/extensions/api/tabs/tabs_api.cc (revision 185383)
+++ chrome/browser/extensions/api/tabs/tabs_api.cc (working copy)
@@ -599,7 +599,8 @@
urls.push_back(GURL(chrome::kChromeUINewTabURL));
#if defined(OS_CHROMEOS)
- if (PanelManager::ShouldUsePanels(extension_id)) {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePanels) &&
+ PanelManager::ShouldUsePanels(extension_id)) {
ShellWindow::CreateParams create_params;
create_params.window_type = ShellWindow::WINDOW_TYPE_V1_PANEL;
create_params.bounds = window_bounds;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698