diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 17:48:22 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-26 17:48:22 +0000 |
| commit | 5a65bc166f794c6734e2f71aed4c280da49c9afa (patch) | |
| tree | 5a6d122b189ef357807984ea4b00efb3847a3a2d /content/renderer | |
| parent | 946792581ad09f3a725b2aa1920dd020e6188092 (diff) | |
| download | chromium_src-5a65bc166f794c6734e2f71aed4c280da49c9afa.zip chromium_src-5a65bc166f794c6734e2f71aed4c280da49c9afa.tar.gz chromium_src-5a65bc166f794c6734e2f71aed4c280da49c9afa.tar.bz2 | |
Revert 144199 - win_aura failure -Start consolidating non-port specific code to ui/base/dialogs.
This moves content::SelectedFileInfo (what the select dialog outputs) and
BaseShellDialog to ui/base/dialogs/.
(This was split off from https://chromiumcodereview.appspot.com/10667026/
because that patch is getting huge.)
BUG=134529
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10669023
TBR=erg@google.com
Review URL: https://chromiumcodereview.appspot.com/10666056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 4 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index ef3ad62..2199171 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -49,6 +49,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/context_menu_params.h" #include "content/public/common/file_chooser_params.h" +#include "content/public/common/selected_file_info.h" #include "content/public/common/url_constants.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/document_state.h" @@ -162,7 +163,6 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/dialogs/selected_file_info.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" @@ -4601,7 +4601,7 @@ void RenderViewImpl::OnEnumerateDirectoryResponse( } void RenderViewImpl::OnFileChooserResponse( - const std::vector<ui::SelectedFileInfo>& files) { + const std::vector<content::SelectedFileInfo>& files) { // This could happen if we navigated to a different page before the user // closed the chooser. if (file_chooser_completions_.empty()) diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 592ec4d..08cf723 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -100,6 +100,7 @@ class RenderViewTest; class RendererAccessibility; struct CustomContextMenuContext; struct FileChooserParams; +struct SelectedFileInfo; } // namespace content namespace gfx { @@ -107,10 +108,6 @@ class Point; class Rect; } // namespace gfx -namespace ui { -struct SelectedFileInfo; -} // namespace ui - namespace webkit { namespace ppapi { @@ -922,7 +919,7 @@ class RenderViewImpl : public RenderWidget, void OnEnumerateDirectoryResponse(int id, const std::vector<FilePath>& paths); void OnExecuteEditCommand(const std::string& name, const std::string& value); void OnFileChooserResponse( - const std::vector<ui::SelectedFileInfo>& files); + const std::vector<content::SelectedFileInfo>& files); void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&); void OnFindReplyAck(); void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url); |