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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: _ Created 8 years, 9 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 unified diff | Download patch
OLDNEW
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/views/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/partial_screenshot_view.h" 9 #include "ash/wm/partial_screenshot_view.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "chrome/browser/chromeos/login/screen_locker.h" 12 #include "chrome/browser/chromeos/login/screen_locker.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h" 15 #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h"
16 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" 16 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
17 #include "chrome/browser/ui/views/ash/status_area_host_aura.h" 17 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"
18 #include "chrome/browser/ui/views/ash/window_positioner.h" 18 #include "chrome/browser/ui/views/ash/window_positioner.h"
19 #include "chrome/browser/ui/views/frame/browser_view.h" 19 #include "chrome/browser/ui/views/frame/browser_view.h"
20 #include "chrome/common/chrome_notification_types.h" 20 #include "chrome/common/chrome_notification_types.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
23 #include "ui/aura/window.h" 23 #include "ui/aura/window.h"
24 24
25 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
26 #include "base/chromeos/chromeos_version.h" 26 #include "base/chromeos/chromeos_version.h"
27 #include "chrome/browser/chromeos/background/desktop_background_observer.h" 27 #include "chrome/browser/chromeos/background/desktop_background_observer.h"
28 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
29 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
30 #include "chrome/browser/chromeos/login/user_manager.h" 28 #include "chrome/browser/chromeos/login/user_manager.h"
31 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 29 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
30 #include "chromeos/dbus/dbus_thread_manager.h"
31 #include "chromeos/dbus/power_manager_client.h"
32 #endif 32 #endif
33 namespace { 33 namespace {
34 34
35 // Returns a list of Aura windows from a BrowserList, using either a 35 // Returns a list of Aura windows from a BrowserList, using either a
36 // const_iterator or const_reverse_iterator. 36 // const_iterator or const_reverse_iterator.
37 template<typename IT> 37 template<typename IT>
38 std::vector<aura::Window*> GetBrowserWindows(IT begin, IT end) { 38 std::vector<aura::Window*> GetBrowserWindows(IT begin, IT end) {
39 std::vector<aura::Window*> windows; 39 std::vector<aura::Window*> windows;
40 for (IT it = begin; it != end; ++it) { 40 for (IT it = begin; it != end; ++it) {
41 Browser* browser = *it; 41 Browser* browser = *it;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 ash::Shell::GetInstance()->CreateLauncher(); 169 ash::Shell::GetInstance()->CreateLauncher();
170 break; 170 break;
171 default: 171 default:
172 NOTREACHED() << "Unexpected notification " << type; 172 NOTREACHED() << "Unexpected notification " << type;
173 } 173 }
174 #else 174 #else
175 // MSVC++ warns about switch statements without any cases. 175 // MSVC++ warns about switch statements without any cases.
176 NOTREACHED() << "Unexpected notification " << type; 176 NOTREACHED() << "Unexpected notification " << type;
177 #endif 177 #endif
178 } 178 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698