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

Side by Side Diff: ash/aura/wm_window_aura.cc

Issue 2251843002: Add window property for restore bounds when virtual keyboard is enabled. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove WM property Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/wm_window.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/aura/wm_window_aura.h" 5 #include "ash/aura/wm_window_aura.h"
6 6
7 #include "ash/aura/aura_layout_manager_adapter.h" 7 #include "ash/aura/aura_layout_manager_adapter.h"
8 #include "ash/aura/wm_root_window_controller_aura.h" 8 #include "ash/aura/wm_root_window_controller_aura.h"
9 #include "ash/aura/wm_shell_aura.h" 9 #include "ash/aura/wm_shell_aura.h"
10 #include "ash/common/ash_constants.h" 10 #include "ash/common/ash_constants.h"
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 return; 296 return;
297 } 297 }
298 if (key == WmWindowProperty::TOP_VIEW_INSET) { 298 if (key == WmWindowProperty::TOP_VIEW_INSET) {
299 window_->SetProperty(aura::client::kTopViewInset, value); 299 window_->SetProperty(aura::client::kTopViewInset, value);
300 return; 300 return;
301 } 301 }
302 302
303 NOTREACHED(); 303 NOTREACHED();
304 } 304 }
305 305
306 gfx::Rect* WmWindowAura::GetRectProperty(WmWindowProperty key) {
307 return new gfx::Rect();
sky 2016/08/18 22:52:17 How come you're not getting the property from the
308 }
309
306 ShelfItemDetails* WmWindowAura::GetShelfItemDetails() { 310 ShelfItemDetails* WmWindowAura::GetShelfItemDetails() {
307 return window_->GetProperty(kShelfItemDetailsKey); 311 return window_->GetProperty(kShelfItemDetailsKey);
308 } 312 }
309 313
310 void WmWindowAura::SetShelfItemDetails(const ShelfItemDetails& details) { 314 void WmWindowAura::SetShelfItemDetails(const ShelfItemDetails& details) {
311 // |item_details| is owned by |window_|. 315 // |item_details| is owned by |window_|.
312 ShelfItemDetails* item_details = new ShelfItemDetails(details); 316 ShelfItemDetails* item_details = new ShelfItemDetails(details);
313 window_->SetProperty(kShelfItemDetailsKey, item_details); 317 window_->SetProperty(kShelfItemDetailsKey, item_details);
314 } 318 }
315 319
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 OnTransientChildAdded(this, Get(transient))); 828 OnTransientChildAdded(this, Get(transient)));
825 } 829 }
826 830
827 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, 831 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
828 aura::Window* transient) { 832 aura::Window* transient) {
829 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, 833 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
830 OnTransientChildRemoved(this, Get(transient))); 834 OnTransientChildRemoved(this, Get(transient)));
831 } 835 }
832 836
833 } // namespace ash 837 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/wm_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698