chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc - Issue 1608843002: Start untangling the avatar switcher from BrowserNonClientFrameView

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_factory_views.cc

Issue 1608843002: Start untangling the avatar switcher from BrowserNonClientFrameView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160119-MacViewsBrowser-Compile

Patch Set: rename, enum class Created 4 years, 11 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_non_client_frame_view_ash.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h » ('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_factory_views.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc

index 5db9a7f33f5630e61725b6d80acd50f0b8f0b4f6..4485cf029414546b84cd91e308af527138dae222 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc

@@ -2,8 +2,6 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"

#include "build/build_config.h"

#include "chrome/browser/ui/views/frame/browser_view.h"

@@ -20,6 +18,10 @@

#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"

#endif

+#if defined(USE_ASH)

+#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"

+#endif

namespace chrome {

BrowserNonClientFrameView* CreateBrowserNonClientFrameView(