| 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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/session/session_state_delegate.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 "chrome/browser/chrome_browser_main.h" | 12 #include "chrome/browser/chrome_browser_main.h" |
| 13 #include "chrome/browser/ui/ash/ash_init.h" | 13 #include "chrome/browser/ui/ash/ash_init.h" |
| 14 #include "chrome/browser/ui/ash/ash_util.h" | 14 #include "chrome/browser/ui/ash/ash_util.h" |
| 15 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 15 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
| 16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 17 #include "ui/aura/env.h" | 17 #include "ui/aura/env.h" |
| 18 #include "ui/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
| 19 #include "ui/gfx/screen_type_delegate.h" | 19 #include "ui/gfx/screen_type_delegate.h" |
| 20 #include "ui/keyboard/keyboard.h" | 20 #include "ui/keyboard/content/keyboard.h" |
| 21 #include "ui/keyboard/keyboard_controller.h" | 21 #include "ui/keyboard/keyboard_controller.h" |
| 22 | 22 |
| 23 #if defined(OS_CHROMEOS) | 23 #if defined(OS_CHROMEOS) |
| 24 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 24 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
| 25 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 25 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 #if !defined(OS_CHROMEOS) | 28 #if !defined(OS_CHROMEOS) |
| 29 #include "ui/shell_dialogs/select_file_dialog.h" | 29 #include "ui/shell_dialogs/select_file_dialog.h" |
| 30 #include "ui/shell_dialogs/shell_dialogs_delegate.h" | 30 #include "ui/shell_dialogs/shell_dialogs_delegate.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 TabScrubber::GetInstance(); | 106 TabScrubber::GetInstance(); |
| 107 // Activate virtual keyboard after profile is initialized. It depends on the | 107 // Activate virtual keyboard after profile is initialized. It depends on the |
| 108 // default profile. | 108 // default profile. |
| 109 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 109 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
| 110 keyboard::KeyboardController::GetInstance()); | 110 keyboard::KeyboardController::GetInstance()); |
| 111 } | 111 } |
| 112 | 112 |
| 113 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 113 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
| 114 chrome::CloseAsh(); | 114 chrome::CloseAsh(); |
| 115 } | 115 } |
| OLD | NEW |