| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/panels/panel_manager.h" | 5 #include "chrome/browser/ui/panels/panel_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 wm_type != ui::WM_ICE_WM && | 115 wm_type != ui::WM_ICE_WM && |
| 116 wm_type != ui::WM_KWIN && | 116 wm_type != ui::WM_KWIN && |
| 117 wm_type != ui::WM_METACITY && | 117 wm_type != ui::WM_METACITY && |
| 118 wm_type != ui::WM_MUFFIN && | 118 wm_type != ui::WM_MUFFIN && |
| 119 wm_type != ui::WM_MUTTER && | 119 wm_type != ui::WM_MUTTER && |
| 120 wm_type != ui::WM_XFWM4) { | 120 wm_type != ui::WM_XFWM4) { |
| 121 return false; | 121 return false; |
| 122 } | 122 } |
| 123 #endif // USE_X11 && !OS_CHROMEOS | 123 #endif // USE_X11 && !OS_CHROMEOS |
| 124 | 124 |
| 125 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); | 125 version_info::Channel channel = chrome::VersionInfo::GetChannel(); |
| 126 if (channel == chrome::VersionInfo::CHANNEL_STABLE || | 126 if (channel == version_info::Channel::STABLE || |
| 127 channel == chrome::VersionInfo::CHANNEL_BETA) { | 127 channel == version_info::Channel::BETA) { |
| 128 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 128 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 129 switches::kEnablePanels) || | 129 switches::kEnablePanels) || |
| 130 extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") || | 130 extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") || |
| 131 extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") || | 131 extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") || |
| 132 extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") || | 132 extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") || |
| 133 extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj"); | 133 extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj"); |
| 134 } | 134 } |
| 135 | 135 |
| 136 return true; | 136 return true; |
| 137 } | 137 } |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) { | 563 void PanelManager::SetMouseWatcher(PanelMouseWatcher* watcher) { |
| 564 panel_mouse_watcher_.reset(watcher); | 564 panel_mouse_watcher_.reset(watcher); |
| 565 } | 565 } |
| 566 | 566 |
| 567 void PanelManager::OnPanelAnimationEnded(Panel* panel) { | 567 void PanelManager::OnPanelAnimationEnded(Panel* panel) { |
| 568 content::NotificationService::current()->Notify( | 568 content::NotificationService::current()->Notify( |
| 569 chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED, | 569 chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED, |
| 570 content::Source<Panel>(panel), | 570 content::Source<Panel>(panel), |
| 571 content::NotificationService::NoDetails()); | 571 content::NotificationService::NoDetails()); |
| 572 } | 572 } |
| OLD | NEW |