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/chrome_browser_main_extra_parts_ash.h" | 5 #include "chrome/browser/chrome_browser_main_extra_parts_ash.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/wm/key_rewriter_event_filter.h" | 10 #include "ash/wm/key_rewriter_event_filter.h" |
11 #include "ash/wm/property_util.h" | 11 #include "ash/wm/property_util.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
14 #include "chrome/browser/ui/browser_list.h" | 14 #include "chrome/browser/ui/browser_list.h" |
15 #include "chrome/browser/ui/views/ash/caps_lock_handler.h" | 15 #include "chrome/browser/ui/views/ash/caps_lock_handler.h" |
16 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" | 16 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" |
17 #include "chrome/browser/ui/views/ash/key_rewriter.h" | 17 #include "chrome/browser/ui/views/ash/key_rewriter.h" |
18 #include "chrome/browser/ui/views/ash/screen_orientation_listener.h" | |
19 #include "chrome/browser/ui/views/ash/screenshot_taker.h" | 18 #include "chrome/browser/ui/views/ash/screenshot_taker.h" |
20 #include "chrome/browser/ui/views/ash/user_gesture_handler.h" | 19 #include "chrome/browser/ui/views/ash/user_gesture_handler.h" |
21 #include "ui/aura/env.h" | 20 #include "ui/aura/env.h" |
22 #include "ui/aura/aura_switches.h" | 21 #include "ui/aura/aura_switches.h" |
23 #include "ui/aura/client/user_gesture_client.h" | 22 #include "ui/aura/client/user_gesture_client.h" |
24 #include "ui/aura/monitor_manager.h" | 23 #include "ui/aura/monitor_manager.h" |
25 #include "ui/aura/root_window.h" | 24 #include "ui/aura/root_window.h" |
26 #include "ui/gfx/compositor/compositor_setup.h" | 25 #include "ui/gfx/compositor/compositor_setup.h" |
27 | 26 |
28 #if defined(OS_CHROMEOS) | 27 #if defined(OS_CHROMEOS) |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 scoped_ptr<ash::CapsLockDelegate>(new CapsLockHandler(xkeyboard)).Pass()); | 73 scoped_ptr<ash::CapsLockDelegate>(new CapsLockHandler(xkeyboard)).Pass()); |
75 shell->accelerator_controller()->SetImeControlDelegate( | 74 shell->accelerator_controller()->SetImeControlDelegate( |
76 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass()); | 75 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass()); |
77 shell->accelerator_controller()->SetVolumeControlDelegate( | 76 shell->accelerator_controller()->SetVolumeControlDelegate( |
78 scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass()); | 77 scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass()); |
79 | 78 |
80 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 79 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
81 switches::kDisableZeroBrowsersOpenForTests)) | 80 switches::kDisableZeroBrowsersOpenForTests)) |
82 BrowserList::StartKeepAlive(); | 81 BrowserList::StartKeepAlive(); |
83 #endif | 82 #endif |
84 | |
85 // Make sure the singleton ScreenOrientationListener object is created. | |
86 ScreenOrientationListener::GetInstance(); | |
87 | |
88 gesture_handler_.reset(new UserGestureHandler); | 83 gesture_handler_.reset(new UserGestureHandler); |
89 aura::client::SetUserGestureClient( | 84 aura::client::SetUserGestureClient( |
90 ash::Shell::GetRootWindow(), gesture_handler_.get()); | 85 ash::Shell::GetRootWindow(), gesture_handler_.get()); |
91 } | 86 } |
92 | 87 |
93 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { | 88 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
94 } | 89 } |
95 | 90 |
96 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 91 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
97 ash::Shell::DeleteInstance(); | 92 ash::Shell::DeleteInstance(); |
98 } | 93 } |
OLD | NEW |