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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/dropdown_bar_host.cc

Issue 8174005: Get Chrome to build & link with USE_AURA on Windows again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/shell_dialogs_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/dropdown_bar_host.cc
===================================================================
--- chrome/browser/ui/views/dropdown_bar_host.cc (revision 104318)
+++ chrome/browser/ui/views/dropdown_bar_host.cc (working copy)
@@ -18,22 +18,22 @@
#include "views/focus/view_storage.h"
#include "views/widget/widget.h"
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+#include "ui/gfx/scoped_sk_region.h"
+#elif defined(OS_WIN)
#include "base/win/scoped_gdi_object.h"
#elif defined(TOOLKIT_USES_GTK)
#include "ui/base/gtk/scoped_handle_gtk.h"
-#else
-#include "ui/gfx/scoped_sk_region.h"
#endif
namespace {
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+typedef gfx::ScopedSkRegion ScopedPlatformRegion;
+#elif defined(OS_WIN)
typedef base::win::ScopedRegion ScopedPlatformRegion;
#elif defined(TOOLKIT_USES_GTK)
typedef ui::ScopedRegion ScopedPlatformRegion;
-#else
-typedef gfx::ScopedSkRegion ScopedPlatformRegion;
#endif
} // namespace
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/shell_dialogs_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698