| Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| index 5ea6ab27a1a1b87b2e71ecd3f3a863f04a51f96c..c356a04e7c81ebeace37f0e9f48f7b1e72592074 100644
|
| --- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| +++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
|
| @@ -18,7 +18,6 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/gfx/screen.h"
|
| -#include "ui/gfx/screen_type_delegate.h"
|
| #include "ui/keyboard/content/keyboard.h"
|
| #include "ui/keyboard/keyboard_controller.h"
|
|
|
| @@ -27,20 +26,6 @@
|
| #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
|
| #endif
|
|
|
| -#if !defined(OS_CHROMEOS)
|
| -class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate {
|
| - public:
|
| - ScreenTypeDelegateWin() {}
|
| - gfx::ScreenType GetScreenTypeForNativeView(gfx::NativeView view) override {
|
| - return chrome::IsNativeViewInAsh(view) ?
|
| - gfx::SCREEN_TYPE_ALTERNATE :
|
| - gfx::SCREEN_TYPE_NATIVE;
|
| - }
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(ScreenTypeDelegateWin);
|
| -};
|
| -#endif // !OS_CHROMEOS
|
| -
|
| ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
|
| }
|
|
|
| @@ -55,10 +40,6 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
|
| ash::Shell::GetInstance()->CreateShelf();
|
| ash::Shell::GetInstance()->ShowShelf();
|
| #endif
|
| - } else {
|
| -#if !defined(OS_CHROMEOS)
|
| - gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateWin);
|
| -#endif
|
| }
|
| #if defined(OS_CHROMEOS)
|
| // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile
|
|
|