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

Unified Diff: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

Issue 136643006: Clean up some ifdefs around Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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
Index: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
===================================================================
--- chrome/browser/extensions/api/bookmarks/bookmarks_api.cc (revision 248569)
+++ chrome/browser/extensions/api/bookmarks/bookmarks_api.cc (working copy)
@@ -48,7 +48,7 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
#include "ui/aura/remote_root_window_host_win.h"
#endif
@@ -946,7 +946,7 @@
gfx::NativeWindow owning_window = web_contents ?
platform_util::GetTopLevel(web_contents->GetView()->GetNativeView())
: NULL;
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
if (!owning_window &&
chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
owning_window = aura::RemoteWindowTreeHostWin::Instance()->GetAshWindow();
« no previous file with comments | « chrome/browser/browser_process_platform_part.h ('k') | chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698