| 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" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "ui/gfx/screen_type_delegate.h" | 21 #include "ui/gfx/screen_type_delegate.h" |
| 22 #include "ui/keyboard/content/keyboard.h" | 22 #include "ui/keyboard/content/keyboard.h" |
| 23 #include "ui/keyboard/keyboard_controller.h" | 23 #include "ui/keyboard/keyboard_controller.h" |
| 24 | 24 |
| 25 #if defined(OS_CHROMEOS) | 25 #if defined(OS_CHROMEOS) |
| 26 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 26 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
| 27 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 27 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
| 28 #endif | 28 #endif |
| 29 | 29 |
| 30 #if !defined(OS_CHROMEOS) | 30 #if !defined(OS_CHROMEOS) |
| 31 #include "ui/shell_dialogs/select_file_dialog.h" | |
| 32 #include "ui/shell_dialogs/shell_dialogs_delegate.h" | |
| 33 #endif | |
| 34 | |
| 35 #if defined(OS_WIN) | |
| 36 #include "base/win/windows_version.h" | |
| 37 #endif | |
| 38 | |
| 39 #if !defined(OS_CHROMEOS) | |
| 40 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate { | 31 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate { |
| 41 public: | 32 public: |
| 42 ScreenTypeDelegateWin() {} | 33 ScreenTypeDelegateWin() {} |
| 43 gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override { | 34 gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override { |
| 44 return chrome::IsNativeViewInAsh(view) ? | 35 return chrome::IsNativeViewInAsh(view) ? |
| 45 gfx::SCREEN_TYPE_ALTERNATE : | 36 gfx::SCREEN_TYPE_ALTERNATE : |
| 46 gfx::SCREEN_TYPE_NATIVE; | 37 gfx::SCREEN_TYPE_NATIVE; |
| 47 } | 38 } |
| 48 private: | 39 private: |
| 49 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateWin); | 40 DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateWin); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 TabScrubber::GetInstance(); | 80 TabScrubber::GetInstance(); |
| 90 // Activate virtual keyboard after profile is initialized. It depends on the | 81 // Activate virtual keyboard after profile is initialized. It depends on the |
| 91 // default profile. | 82 // default profile. |
| 92 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( | 83 ash::Shell::GetPrimaryRootWindowController()->ActivateKeyboard( |
| 93 keyboard::KeyboardController::GetInstance()); | 84 keyboard::KeyboardController::GetInstance()); |
| 94 } | 85 } |
| 95 | 86 |
| 96 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 87 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
| 97 chrome::CloseAsh(); | 88 chrome::CloseAsh(); |
| 98 } | 89 } |
| OLD | NEW |