chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc - Issue 2215223003: Moves most frame related classes to ash/common/frame

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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 | « chrome/browser/ui/views/frame/browser_header_painter_ash.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2f2b9babc3c88cdc91797d51f0e2e76cc598d272..36a5e4f9a48cd2c7c9dcb606f15e966e1ea9ac43 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

@@ -7,12 +7,13 @@

#include <algorithm>

#include "ash/common/ash_layout_constants.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/frame/header_painter_util.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 "ash/frame/header_painter_util.h"

#include "build/build_config.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/extensions/extension_util.h"

@@ -215,8 +216,8 @@ gfx::Rect BrowserNonClientFrameViewAsh::GetWindowBoundsForClientBounds(

}

int BrowserNonClientFrameViewAsh::NonClientHitTest(const gfx::Point& point) {

- const int hit_test = ash::FrameBorderHitTestController::NonClientHitTest(

- this, caption_button_container_, point);

+ const int hit_test =

+ ash::FrameBorderNonClientHitTest(this, caption_button_container_, point);

// See if the point is actually within the web app back button.

if (hit_test == HTCAPTION && web_app_left_header_view_ &&