Adding new maximize menu according to spec

ash/wm/workspace/phantom_window_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/wm/workspace/phantom_window_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/aura/window.h"
@@ skipping 54 matching lines @@
         SkIntToScalar(kRoundRectSize), paint);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EdgePainter);
 };
 
 }  // namespace
 
 PhantomWindowController::PhantomWindowController(aura::Window* window)
-    : window_(window) {
+    : window_(window),
+      phantom_below_window_(NULL),
+      phantom_widget_(NULL) {
 }
 
 PhantomWindowController::~PhantomWindowController() {
   Hide();
 }
 
 void PhantomWindowController::Show(const gfx::Rect& bounds) {
   if (bounds == bounds_)
     return;
   bounds_ = bounds;
-  if (!phantom_widget_.get()) {
+  if (!phantom_widget_) {
     // Show the phantom at the bounds of the window. We'll animate to the target
     // bounds.
     start_bounds_ = window_->GetBoundsInScreen();
     CreatePhantomWidget(start_bounds_);
   } else {
     start_bounds_ = phantom_widget_->GetWindowBoundsInScreen();
   }
   animation_.reset(new ui::SlideAnimation(this));
   animation_->Show();
 }
 
 void PhantomWindowController::SetBounds(const gfx::Rect& bounds) {
   DCHECK(IsShowing());
   animation_.reset();
   bounds_ = bounds;
   phantom_widget_->SetBounds(bounds_);
 }
 
 void PhantomWindowController::Hide() {
-  phantom_widget_.reset();
+  phantom_widget_->Close();
+  phantom_widget_ = NULL;
 }
 
 bool PhantomWindowController::IsShowing() const {
-  return phantom_widget_.get() != NULL;
+  return phantom_widget_ != NULL;
 }
 
 void PhantomWindowController::AnimationProgressed(
     const ui::Animation* animation) {
   phantom_widget_->SetBounds(
       animation->CurrentValueBetween(start_bounds_, bounds_));
 }
 
 void PhantomWindowController::CreatePhantomWidget(const gfx::Rect& bounds) {
-  DCHECK(!phantom_widget_.get());
-  phantom_widget_.reset(new views::Widget);
+  DCHECK(!phantom_widget_);
+  phantom_widget_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.transparent = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;

[sky, 2012/08/03 19:42:00]

This needs to change, otherwise we're going to leak the widget.

[Mr4D (OOO till 08-26), 2012/08/03 20:39:28]

Ahhh. Interesting! Thanks for figuring that out! Done.

   // PhantomWindowController is used by FrameMaximizeButton to highlight the
   // launcher button. Put the phantom in the same window as the launcher so that
   // the phantom is visible.
   params.parent = Shell::GetContainer(
       Shell::GetInstance()->GetRootWindowMatching(bounds),
       kShellWindowId_LauncherContainer);
   params.can_activate = false;
   params.keep_on_top = true;
   phantom_widget_->set_focus_on_creation(false);
   phantom_widget_->Init(params);
   phantom_widget_->SetVisibilityChangedAnimationsEnabled(false);
   phantom_widget_->GetNativeWindow()->SetName("PhantomWindow");
   views::View* content_view = new views::View;
   content_view->set_background(
       views::Background::CreateBackgroundPainter(true, new EdgePainter));
   phantom_widget_->SetContentsView(content_view);
   phantom_widget_->SetBounds(bounds);
-  phantom_widget_->StackAbove(window_);
+  if (phantom_below_window_)
+    phantom_widget_->StackBelow(phantom_below_window_);
+  else
+    phantom_widget_->StackAbove(window_);
   phantom_widget_->Show();
   // Fade the window in.
   ui::Layer* layer = phantom_widget_->GetNativeWindow()->layer();
   layer->SetOpacity(0);
   ui::ScopedLayerAnimationSettings scoped_setter(layer->GetAnimator());
   layer->SetOpacity(1);
 }
 
 }  // namespace internal
 }  // namespace ash