Revert 197501 "Merge 195552 "Restore focus/activation after the ..."

ash/display/display_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_controller.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/json/json_value_converter.h"
 #include "base/string_piece.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
-#include "ui/aura/client/activation_client.h"
-#include "ui/aura/client/capture_client.h"
-#include "ui/aura/client/cursor_client.h"
-#include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
-#include "ui/aura/window_tracker.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/output_configurator_animation.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
@@ skipping 174 matching lines @@
   ui::SetIntProperty(xwindow,
                      kScaleFactorProp,
                      kCARDINAL,
                      100 * display.device_scale_factor());
 #endif
   RotateRootWindow(root, display, info);
 }
 
 }  // namespace
 
-namespace internal {
-
-// A utility class to store/restore focused/active window
-// when the display configuration has changed.
-class FocusActivationStore {
- public:
-  FocusActivationStore()
-      : activation_client_(NULL),
-        capture_client_(NULL),
-        focus_client_(NULL),
-        focused_(NULL),
-        active_(NULL) {
-  }
-
-  void Store() {
-    if (!activation_client_) {
-      aura::RootWindow* root = Shell::GetPrimaryRootWindow();
-      activation_client_ = aura::client::GetActivationClient(root);
-      capture_client_ = aura::client::GetCaptureClient(root);
-      focus_client_ = aura::client::GetFocusClient(root);
-    }
-    focused_ = focus_client_->GetFocusedWindow();
-    if (focused_)
-      tracker_.Add(focused_);
-    active_ = activation_client_->GetActiveWindow();
-    if (active_ && focused_ != active_)
-      tracker_.Add(active_);
-
-    // Deactivate the window to close menu / bubble windows.
-    activation_client_->DeactivateWindow(active_);
-    // Release capture if any.
-    capture_client_->SetCapture(NULL);
-    // Clear the focused window if any. This is necessary because a
-    // window may be deleted when losing focus (fullscreen flash for
-    // example).  If the focused window is still alive after move, it'll
-    // be re-focused below.
-    focus_client_->FocusWindow(NULL);
-  }
-
-  void Restore() {
-    // Restore focused or active window if it's still alive.
-    if (focused_ && tracker_.Contains(focused_)) {
-      focus_client_->FocusWindow(focused_);
-    } else if (active_ && tracker_.Contains(active_)) {
-      activation_client_->ActivateWindow(active_);
-    }
-    if (focused_)
-      tracker_.Remove(focused_);
-    if (active_)
-      tracker_.Remove(active_);
-    focused_ = NULL;
-    active_ = NULL;
-  }
-
- private:
-  aura::client::ActivationClient* activation_client_;
-  aura::client::CaptureClient* capture_client_;
-  aura::client::FocusClient* focus_client_;
-  aura::WindowTracker tracker_;
-  aura::Window* focused_;
-  aura::Window* active_;
-
-  DISALLOW_COPY_AND_ASSIGN(FocusActivationStore);
-};
-
-}  // namespace internal
-
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayLayout
 
 // static
 DisplayLayout DisplayLayout::FromInts(int position, int offsets) {
   return DisplayLayout(static_cast<Position>(position), offsets);
 }
 
 DisplayLayout::DisplayLayout()
     : position(RIGHT),
@@ skipping 86 matching lines @@
 
 bool DisplayController::DisplayChangeLimiter::IsThrottled() const {
   return base::Time::Now() < throttle_timeout_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayController
 
 DisplayController::DisplayController()
     : desired_primary_display_id_(gfx::Display::kInvalidDisplayID),
-      primary_root_window_for_replace_(NULL),
-      focus_activation_store_(new internal::FocusActivationStore()) {
+      primary_root_window_for_replace_(NULL) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 #if defined(OS_CHROMEOS)
   if (!command_line->HasSwitch(switches::kAshDisableDisplayChangeLimiter) &&
       base::chromeos::IsRunningOnChromeOS())
     limiter_.reset(new DisplayChangeLimiter);
 #endif
   if (command_line->HasSwitch(switches::kAshSecondaryDisplayLayout)) {
     std::string value = command_line->GetSwitchValueASCII(
         switches::kAshSecondaryDisplayLayout);
     char layout;
@@ skipping 552 matching lines @@
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 void DisplayController::NotifyDisplayConfigurationChanging() {
   FOR_EACH_OBSERVER(Observer, observers_, OnDisplayConfigurationChanging());
-  focus_activation_store_->Store();
 }
 
 void DisplayController::NotifyDisplayConfigurationChanged() {
-  focus_activation_store_->Restore();
-
   internal::DisplayManager* display_manager = GetDisplayManager();
   if (display_manager->num_connected_displays() > 1) {
     DisplayIdPair pair = GetCurrentDisplayIdPair();
     bool exists = paired_layouts_.find(pair) != paired_layouts_.end();
     if (exists || display_manager->IsMirrored()) {
       if (!exists)
         paired_layouts_[pair] = default_display_layout_;
       paired_layouts_[pair].mirrored = display_manager->IsMirrored();
     }
   }
@@ skipping 11 matching lines @@
 }
 
 void DisplayController::OnFadeOutForSwapDisplayFinished() {
 #if defined(OS_CHROMEOS)
   SetPrimaryDisplay(ScreenAsh::GetSecondaryDisplay());
   Shell::GetInstance()->output_configurator_animation()->StartFadeInAnimation();
 #endif
 }
 
 }  // namespace ash