Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « chrome/browser/ui/views/app_list/win/app_list_win.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698