diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:49:20 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:49:20 +0000 |
| commit | 4344a3c6d9e58ab7b9ee613024186ef34f619c30 (patch) | |
| tree | d9c19d0f9fe541d6fff8250fe9f799ec367953e6 /content/renderer | |
| parent | 6f90b9e6f0ad978c11510fa362791aa896fdde7d (diff) | |
| download | chromium_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 'content/renderer')
| -rw-r--r-- | content/renderer/pepper/pepper_file_chooser_host_unittest.cc | 2 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc index 2cf7ec0..556f130 100644 --- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc +++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc @@ -22,7 +22,7 @@ #include "ppapi/shared_impl/resource_tracker.h" #include "ppapi/shared_impl/test_globals.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/dialogs/selected_file_info.h" +#include "ui/shell_dialogs/selected_file_info.h" namespace content { diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 30e8eed..0f3633f 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -185,12 +185,12 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/dialogs/selected_file_info.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size_conversions.h" +#include "ui/shell_dialogs/selected_file_info.h" #include "v8/include/v8.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/base/file_path_string_conversions.h" |