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

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2222653002: Moves CustomFrameViewAsh to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/frame/custom_frame_view_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_window_aura.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
index eee64409916de98bcb30ebcf8306f6efedfc25a6..5d925ba952eb1524231b699b5745ecbddde9f7cd 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/aura/wm_window_aura.cc
@@ -17,6 +17,7 @@
#include "ash/screen_util.h"
#include "ash/shelf/shelf_util.h"
#include "ash/shell.h"
+#include "ash/wm/resize_handle_window_targeter.h"
#include "ash/wm/resize_shadow_controller.h"
#include "ash/wm/window_animations.h"
#include "ash/wm/window_mirror_view.h"
@@ -294,6 +295,10 @@ void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
SetShelfIDForWindow(value, window_);
return;
}
+ if (key == WmWindowProperty::TOP_VIEW_INSET) {
+ window_->SetProperty(aura::client::kTopViewInset, value);
+ return;
+ }
NOTREACHED();
}
@@ -649,6 +654,12 @@ void WmWindowAura::HideResizeShadow() {
resize_shadow_controller->HideShadow(window_);
}
+void WmWindowAura::InstallResizeHandleWindowTargeter(
+ WmImmersiveFullscreenController* immersive_fullscreen_controller) {
+ window_->SetEventTargeter(base::MakeUnique<ResizeHandleWindowTargeter>(
+ window_, immersive_fullscreen_controller));
+}
+
void WmWindowAura::SetBoundsInScreenBehaviorForChildren(
BoundsInScreenBehavior behavior) {
window_->SetProperty(
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/frame/custom_frame_view_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698