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

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: GetNativeScreen 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 7aa7d71bb9eedaabd0f2113540edbd189adac19e..bc0d37e86cf814381d975df54068d68b3d6f9a88 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"
@@ -37,17 +36,6 @@
#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);
-};
class ShellDialogsDelegateWin : public ui::ShellDialogsDelegate {
public:
@@ -65,7 +53,7 @@ class ShellDialogsDelegateWin : public ui::ShellDialogsDelegate {
base::LazyInstance<ShellDialogsDelegateWin> g_shell_dialogs_delegate;
-#endif
+#endif // !OS_CHROMEOS
ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
}
@@ -83,7 +71,6 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
#endif
} else {
#if !defined(OS_CHROMEOS)
- gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateWin);
ui::SelectFileDialog::SetShellDialogsDelegate(
g_shell_dialogs_delegate.Pointer());
#endif

Powered by Google App Engine
This is Rietveld 408576698