Remove kViewerConnect and GPU as WARP

I don't think we need WARP other than for Metro.

TBR=jam
R=sky, jbauman
BUG=558054

Review URL: https://codereview.chromium.org/1649213002

Cr-Commit-Position: refs/heads/master@{#372511}

1 files changed, 1 insertions, 17 deletions

diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index 8f00e02..e7b478d 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -154,24 +154,8 @@ class DefaultTargetDisplayProvider : public WindowSizer::TargetDisplayProvider {
   gfx::Display GetTargetDisplay(const gfx::Screen* screen,
                                 const gfx::Rect& bounds) const override {
 #if defined(USE_ASH)
-    bool force_ash = false;
-    // On Windows check if the browser is launched to serve ASH. If yes then
-    // we should get the display for the corresponding root window created for
-    // ASH. This ensures that the display gets the correct workarea, etc.
-    // If the ASH shell does not exist then the current behavior is to open
-    // browser windows if any on the desktop. Preserve that for now.
-    // TODO(ananta).
-    // This effectively means that the running browser process is in a split
-    // personality mode, part of it running in ASH and the other running in
-    // desktop. This may cause apps and other widgets to not work correctly.
-    // Revisit and address.
-#if defined(OS_WIN)
-    force_ash = ash::Shell::HasInstance() &&
-                base::CommandLine::ForCurrentProcess()->HasSwitch(
-                    switches::kViewerConnect);
-#endif
     // Use the target display on ash.
-    if (chrome::ShouldOpenAshOnStartup() || force_ash) {
+    if (chrome::ShouldOpenAshOnStartup()) {
       aura::Window* target = ash::Shell::GetTargetRootWindow();
       return screen->GetDisplayNearestWindow(target);
     }