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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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
« chrome/browser/ui/views/find_bar_host.cc ('K') | « chrome/browser/ui/views/find_bar_host.cc ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | chrome/browser/ui/views/task_manager_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_frame.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_frame.cc (revision 99456)
+++ chrome/browser/ui/views/frame/browser_frame.cc (working copy)
@@ -17,7 +17,7 @@
#include "ui/base/theme_provider.h"
#include "views/widget/native_widget.h"
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
#endif
@@ -106,14 +106,14 @@
}
views::NonClientFrameView* BrowserFrame::CreateNonClientFrameView() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
if (ShouldUseNativeFrame()) {
browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_);
} else {
#endif
browser_frame_view_ =
browser::CreateBrowserNonClientFrameView(this, browser_view_);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
}
#endif
return browser_frame_view_;
« chrome/browser/ui/views/find_bar_host.cc ('K') | « chrome/browser/ui/views/find_bar_host.cc ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | chrome/browser/ui/views/task_manager_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698