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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 36a5e4f9a48cd2c7c9dcb606f15e966e1ea9ac43..1f62a0a7719adf3d2316414f15e27276a643d43f 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -12,8 +12,9 @@
#include "ash/common/frame/frame_border_hit_test.h"
#include "ash/common/frame/header_painter_util.h"
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h"
-#include "ash/frame/frame_border_hit_test_controller.h"
+#include "ash/common/wm_window.h"
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/extensions/extension_util.h"
@@ -95,9 +96,10 @@ BrowserNonClientFrameViewAsh::BrowserNonClientFrameViewAsh(
: BrowserNonClientFrameView(frame, browser_view),
caption_button_container_(nullptr),
web_app_left_header_view_(nullptr),
- window_icon_(nullptr),
- frame_border_hit_test_controller_(
- new ash::FrameBorderHitTestController(frame)) {
+ window_icon_(nullptr) {
+ ash::WmLookup::Get()
+ ->GetWindowForWidget(frame)
+ ->InstallResizeHandleWindowTargeter(nullptr);
ash::WmShell::Get()->AddShellObserver(this);
}

Powered by Google App Engine
This is Rietveld 408576698