chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc - Issue 1498733003: Ash Flag on Linux: Modified and Renamed Factory Files

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 1498733003: Ash Flag on Linux: Modified and Renamed Factory Files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed logic and #if define Created 5 years 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_factory_ash.cc ('k') | chrome/browser/ui/views/frame/immersive_mode_controller_factory_ash.cc » ('j') | chrome/chrome_browser_ui.gypi » ('J')
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_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc

similarity index 94%

rename from chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc

rename to chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc

index c7ae34f021c8bc9649282b5e62439c4aa515da25..60fea207d73ce3acf5963c78f83201bcc340cf4f 100644

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

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

@@ -30,10 +30,15 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(

}

#endif

+#if defined(USE_ASH)

BrowserNonClientFrameViewAsh* frame_view =

new BrowserNonClientFrameViewAsh(frame, browser_view);

frame_view->Init();

return frame_view;

+#else

+ NOTREACHED();

+ return nullptr;

+#endif

}

} // namespace chrome