No browserless Panels unless enabled by flag.

Even having it in trunk breaks gtalk.
Restored old flag for turning on browserless panels temporarily.

TBR=dcheng

BUG=143506
TEST=ensured browserless panels off by default

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=152201

Review URL: https://chromiumcodereview.appspot.com/10831383

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152246 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/panels/panel_manager.cc

@@ -93,8 +93,12 @@ bool PanelManager::UseBrowserlessPanels() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kOldPanels))
     return false;
 
-  return chrome::VersionInfo::GetChannel() <=
-      chrome::VersionInfo::CHANNEL_UNKNOWN;
+  // http://crbug.com/143506
+  // TODO(jennb): Remove after channel check can be used.
+// return chrome::VersionInfo::GetChannel() <= chrome::VersionInfo::CHANNEL_DEV;
+  // For now, use former flag to turn on browserless panels.
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kBrowserlessPanels);
 }
 
 PanelManager::PanelManager()

chrome/common/chrome_switches.cc

@@ -129,6 +129,11 @@ const char kAutomationClientChannelID[]     = "automation-channel";
 const char kAutomationReinitializeOnChannelError[] =
     "automation-reinitialize-on-channel-error";
 
+// Use the (in-progress) refactor of desktop Panel windows which does not
+// require a Browser. Flag will be removed after refactor is ready to replace
+// existing BrowserWindow Panels.
+const char kBrowserlessPanels[] = "browserless-panels";
+
 // How often (in seconds) to check for updates. Should only be used for testing
 // purposes.
 const char kCheckForUpdateIntervalSec[]     = "check-for-update-interval";

chrome/common/chrome_switches.h

@@ -50,6 +50,7 @@ extern const char kAuthServerWhitelist[];
 extern const char kAutoLaunchAtStartup[];
 extern const char kAutomationClientChannelID[];
 extern const char kAutomationReinitializeOnChannelError[];
+extern const char kBrowserlessPanels[];
 extern const char kCheckForUpdateIntervalSec[];
 extern const char kCheckCloudPrintConnectorPolicy[];
 extern const char kChromeFrameShutdownDelay[];