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

Unified Diff: ash/wm/workspace/phantom_window_controller.cc

Issue 10823025: Adding new maximize menu according to spec (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed merging issues Created 8 years, 5 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: ash/wm/workspace/phantom_window_controller.cc
diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc
index 99861fdb3bd2ff041b58e6622ee95e4d2db97402..bc5c245affa47c27fc216e07d645f58136d7fd0c 100644
--- a/ash/wm/workspace/phantom_window_controller.cc
+++ b/ash/wm/workspace/phantom_window_controller.cc
@@ -72,7 +72,8 @@ class EdgePainter : public views::Painter {
} // namespace
PhantomWindowController::PhantomWindowController(aura::Window* window)
- : window_(window) {
+ : window_(window),
+ phantom_below_window_(NULL) {
}
PhantomWindowController::~PhantomWindowController() {
@@ -139,7 +140,10 @@ void PhantomWindowController::CreatePhantomWidget(const gfx::Rect& bounds) {
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();

Powered by Google App Engine
This is Rietveld 408576698