Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / bookmarks / bookmarks_api.cc

diff --git a/src/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/src/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index e8e1802..7f89fab 100644 (file)
--- a/src/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/src/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -28,7 +28,6 @@
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_uma.h"
 #include "chrome/browser/platform_util.h"
@@ -44,12 +43,13 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/quota_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_WIN) && defined(USE_AURA)
-#include "ui/aura/remote_root_window_host_win.h"
+#if defined(OS_WIN)
+#include "ui/aura/remote_window_tree_host_win.h"
 #endif
 
 namespace extensions {
@@ -946,7 +946,7 @@ void BookmarksIOFunction::ShowSelectFileDialog(
   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();