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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/frame/browser_view.h

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/frame/browser_frame.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('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_view.h
===================================================================
--- chrome/browser/ui/views/frame/browser_view.h (revision 99456)
+++ chrome/browser/ui/views/frame/browser_view.h (working copy)
@@ -696,7 +696,7 @@
scoped_ptr<FullscreenExitBubbleViews> fullscreen_bubble_;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// The additional items we insert into the system menu.
scoped_ptr<views::SystemMenuModel> system_menu_contents_;
scoped_ptr<ZoomMenuModel> zoom_menu_contents_;
« chrome/browser/ui/views/find_bar_host.cc ('K') | « chrome/browser/ui/views/frame/browser_frame.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | chrome/browser/ui/views/task_manager_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698