Disable extension Panels on Dev and Canary, except for the whitelist

chrome/browser/ui/panels/panel_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/panels/panel_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/panels/detached_panel_collection.h"
 #include "chrome/browser/ui/panels/docked_panel_collection.h"
 #include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_resize_controller.h"
 #include "chrome/browser/ui/panels/stacked_panel_collection.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/common/constants.h"
 #include "ui/base/hit_test.h"
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 #include "base/environment.h"
 #include "base/nix/xdg_util.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace {
 // Maxmium width of a panel is based on a factor of the working area.
@@ skipping 63 matching lines @@
 }
 
 // static
 void PanelManager::SetDisplaySettingsProviderForTesting(
     DisplaySettingsProvider* provider) {
   display_settings_provider_for_testing = provider;
 }
 
 // static
 bool PanelManager::ShouldUsePanels(const std::string& extension_id) {
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-  // If --enable-panels is on, always use panels on Linux.
+  // If --enable-panels is on, always use panels.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePanels))
     return true;
 
-  // Otherwise, panels are only supported on tested window managers.
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+  // On Linux, panels are only supported on tested window managers.
   ui::WindowManagerName wm_type = ui::GuessWindowManager();
   if (wm_type != ui::WM_COMPIZ &&
       wm_type != ui::WM_ICE_WM &&
       wm_type != ui::WM_KWIN &&
       wm_type != ui::WM_METACITY &&
       wm_type != ui::WM_MUFFIN &&
       wm_type != ui::WM_MUTTER &&
       wm_type != ui::WM_XFWM4) {
     return false;
   }
 #endif  // USE_X11 && !OS_CHROMEOS
 
-  version_info::Channel channel = chrome::GetChannel();
-  if (channel == version_info::Channel::STABLE ||
-      channel == version_info::Channel::BETA) {
-    return base::CommandLine::ForCurrentProcess()->HasSwitch(
-               switches::kEnablePanels) ||
-           extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") ||
-           extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") ||
-           extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") ||
-           extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj");
+  // Without --enable-panels, only support Hangouts.
+  for (const char* id : extension_misc::kHangoutsExtensionIds) {
+    if (extension_id == id)
+      return true;

[tapted, 2015/09/07 05:30:27]

To keep things simple, this would now return true for the Hangouts packaged
apps, but ShouldUsePanels() is never called for packaged apps, so it shouldn't
matter.

   }
 
-  return true;
+  return false;
 }
 
 // static
 bool PanelManager::IsPanelStackingEnabled() {
   // Stacked panel mode is not supported in linux-aura.
 #if defined(OS_LINUX)
   return false;
 #else
   return true;
 #endif
@@ skipping 416 matching lines @@
 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) {
   panel_mouse_watcher_.reset(watcher);
 }
 
 void PanelManager::OnPanelAnimationEnded(Panel* panel) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
       content::Source<Panel>(panel),
       content::NotificationService::NoDetails());
 }