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

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: Put ash file back into linux in gyp 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
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

Powered by Google App Engine
This is Rietveld 408576698