Revert 114095 - Move the concept of Activation to the Shell.

ui/aura/window.cc

 // Copyright (c) 2011 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 "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 85 matching lines @@
     UpdateLayerName(name_);
 }
 
 void Window::Show() {
   SetVisible(true);
 }
 
 void Window::Hide() {
   SetVisible(false);
   ReleaseCapture();
+  if (RootWindow::GetInstance()->active_window() == this ||
+      !RootWindow::GetInstance()->active_window()) {
+    RootWindow::GetInstance()->ActivateTopmostWindow();
+  }
 }
 
 bool Window::IsVisible() const {
   return layer_->IsDrawn();
 }
 
 gfx::Rect Window::GetScreenBounds() const {
   gfx::Point origin = bounds().origin();
   Window::ConvertPointToWindow(parent_,
                                aura::RootWindow::GetInstance(),
                                &origin);
   return gfx::Rect(origin, bounds().size());
 }
 
+void Window::Activate() {
+  // If we support minimization need to ensure this restores the window first.
+  aura::RootWindow::GetInstance()->SetActiveWindow(this, this);
+}
+
+void Window::Deactivate() {
+  aura::RootWindow::GetInstance()->Deactivate(this);
+}
+
+bool Window::IsActive() const {
+  return aura::RootWindow::GetInstance()->active_window() == this;
+}
+
 void Window::SetTransform(const ui::Transform& transform) {
   layer()->SetTransform(transform);
 }
 
 void Window::SetLayoutManager(LayoutManager* layout_manager) {
   layout_manager_.reset(layout_manager);
 }
 
 void Window::SetBounds(const gfx::Rect& new_bounds) {
   if (parent_ && parent_->layout_manager())
@@ skipping 65 matching lines @@
     Window* transient_child = *i;
     if (transient_child->parent_ == this) {
       StackChildAbove(transient_child, last_transient);
       last_transient = transient_child;
     }
   }
 
   child->OnStackingChanged();
 }
 
+bool Window::CanActivate() const {
+  return IsVisible() && (!delegate_ || delegate_->ShouldActivate(NULL));
+}
+
 void Window::AddChild(Window* child) {
   DCHECK(std::find(children_.begin(), children_.end(), child) ==
       children_.end());
   if (child->parent())
     child->parent()->RemoveChild(child);
   child->parent_ = this;
 
   layer_->Add(child->layer_.get());
 
   children_.push_back(child);
@@ skipping 329 matching lines @@
   if (id_ != -1) {
     char id_buf[10];
     base::snprintf(id_buf, sizeof(id_buf), " %d", id_);
     layer_name.append(id_buf);
   }
   layer()->set_name(layer_name);
 #endif
 }
 
 }  // namespace aura