Index: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc |
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc |
index 4943632fbdb8bd3b37c2036d582af5a092c04385..4c4112d3d26b974830d016c8d7cdb1ec12b479e8 100644 |
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc |
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc |
@@ -52,6 +52,10 @@ |
#include "extensions/browser/notification_types.h" |
#include "ui/base/l10n/l10n_util.h" |
+#if defined(OS_WIN) |
+#include "ui/aura/remote_window_tree_host_win.h" |
+#endif |
+ |
using bookmarks::BookmarkModel; |
using bookmarks::BookmarkNode; |
using bookmarks::ManagedBookmarkService; |
@@ -794,6 +798,11 @@ |
gfx::NativeWindow owning_window = web_contents ? |
platform_util::GetTopLevel(web_contents->GetNativeView()) |
: NULL; |
+#if defined(OS_WIN) |
+ if (!owning_window && |
+ chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) |
+ owning_window = aura::RemoteWindowTreeHostWin::Instance()->GetAshWindow(); |
+#endif |
// |web_contents| can be NULL (for background pages), which is fine. In such |
// a case if file-selection dialogs are forbidden by policy, we will not |
// show an InfoBar, which is better than letting one appear out of the blue. |