Index: chrome/browser/extensions/api/tabs/tabs.cc |
diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc |
index 2e069b65cb5a57a4be5c3006c086785fe7444e8b..c61e4818f8ee3557ac2430303a91fd974ead22a6 100644 |
--- a/chrome/browser/extensions/api/tabs/tabs.cc |
+++ b/chrome/browser/extensions/api/tabs/tabs.cc |
@@ -50,6 +50,7 @@ |
#include "chrome/browser/web_applications/web_app.h" |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/chrome_switches.h" |
+#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/extensions/api/windows.h" |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/extensions/extension_error_utils.h" |
@@ -575,8 +576,11 @@ bool CreateWindowFunction::RunImpl() { |
std::string title = |
web_app::GenerateApplicationNameFromExtensionId(extension_id); |
#if !defined(USE_ASH) |
+ chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kBrowserlessPanels)) { |
+ switches::kBrowserlessPanels) || |
+ channel == chrome::VersionInfo::CHANNEL_DEV || |
+ channel == chrome::VersionInfo::CHANNEL_CANARY) { |
Matt Perry
2012/08/16 20:22:07
You can use channel <= DEV to cover these cases, a
jennb
2012/08/16 20:42:50
I don't want to include CHANNEL_UNKNOWN. That way,
|
// Note: Panels ignore all but the first url provided. |
Panel* panel = PanelManager::GetInstance()->CreatePanel( |
title, window_profile, urls[0], panel_bounds.size()); |