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/views/ash/chrome_browser_main_extra_parts_ash.h" | 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" |
6 | 6 |
| 7 #include "ash/common/session/session_state_delegate.h" |
7 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
8 #include "ash/session/session_state_delegate.h" | |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
14 #include "chrome/browser/chrome_browser_main.h" | 14 #include "chrome/browser/chrome_browser_main.h" |
15 #include "chrome/browser/ui/ash/ash_init.h" | 15 #include "chrome/browser/ui/ash/ash_init.h" |
16 #include "chrome/browser/ui/ash/ash_util.h" | 16 #include "chrome/browser/ui/ash/ash_util.h" |
17 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 17 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 TabScrubber::GetInstance(); | 61 TabScrubber::GetInstance(); |
62 // Activate virtual keyboard after profile is initialized. It depends on the | 62 // Activate virtual keyboard after profile is initialized. It depends on the |
63 // default profile. | 63 // default profile. |
64 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 64 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
65 keyboard::KeyboardController::GetInstance()); | 65 keyboard::KeyboardController::GetInstance()); |
66 } | 66 } |
67 | 67 |
68 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 68 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
69 chrome::CloseAsh(); | 69 chrome::CloseAsh(); |
70 } | 70 } |
OLD | NEW |