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

Unified Diff: ash/wm/panels/panel_frame_view.cc

Issue 2215223003: Moves most frame related classes to ash/common/frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment 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/touch/touch_uma.cc ('k') | chrome/browser/ui/views/frame/browser_header_painter_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_frame_view.cc
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index 129d9010bdeaa7a7cf6e2208b2d25415d02c3424..c06548e498ba513fe4dfcb0dcc2dbe0a297418fa 100644
--- a/ash/wm/panels/panel_frame_view.cc
+++ b/ash/wm/panels/panel_frame_view.cc
@@ -4,10 +4,11 @@
#include "ash/wm/panels/panel_frame_view.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/default_header_painter.h"
+#include "ash/common/frame/frame_border_hit_test.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/default_header_painter.h"
#include "ash/frame/frame_border_hit_test_controller.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
@@ -126,8 +127,7 @@ gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds(
int PanelFrameView::NonClientHitTest(const gfx::Point& point) {
if (!header_painter_)
return HTNOWHERE;
- return FrameBorderHitTestController::NonClientHitTest(
- this, caption_button_container_, point);
+ return FrameBorderNonClientHitTest(this, caption_button_container_, point);
}
void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
« no previous file with comments | « ash/touch/touch_uma.cc ('k') | chrome/browser/ui/views/frame/browser_header_painter_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698