summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/file_system/file_system_api.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:49:20 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:49:20 +0000
commit4344a3c6d9e58ab7b9ee613024186ef34f619c30 (patch)
treed9c19d0f9fe541d6fff8250fe9f799ec367953e6 /chrome/browser/extensions/api/file_system/file_system_api.h
parent6f90b9e6f0ad978c11510fa362791aa896fdde7d (diff)
downloadchromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.zip
chromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.tar.gz
chromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.tar.bz2
Bring back the file dialogs for chrome AURA.
The AURA specific changes have been isolated in select_file_dialog_win.cc where we retrieve the top level window handle from the AURA root window. As per a discussion with Ben fixed the layering violation where in ui\base was depending on gfx::NativeView/NativeWindow which led to a layering violation on AURA. This was via ui\base\dialogs Moved the files out of ui\base\dialogs into a new gypi file shell_dialogs.gypi which lives in ui. It is included by ui.gyp The relevant code in chrome browser now depends on the shell_dialogs target created by shell_dialogs.gypi. The ui/base/dialogs folder will be deleted in a subsequent change. There were problems applying this patch on the try bots when I added the deletes to this change. BUG=170483 Review URL: https://codereview.chromium.org/11956031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/file_system/file_system_api.h')
-rw-r--r--chrome/browser/extensions/api/file_system/file_system_api.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.h b/chrome/browser/extensions/api/file_system/file_system_api.h
index 0e7cbfd..220f6c2 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api.h
+++ b/chrome/browser/extensions/api/file_system/file_system_api.h
@@ -7,7 +7,7 @@
#include "chrome/browser/extensions/extension_function.h"
#include "chrome/common/extensions/api/file_system.h"
-#include "ui/base/dialogs/select_file_dialog.h"
+#include "ui/shell_dialogs/select_file_dialog.h"
namespace extensions {