diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 18:50:54 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 18:50:54 +0000 |
commit | aaed25234a6000a0f35eda3c5c4b1e58d9a401de (patch) | |
tree | ba46f11711cde21dfdcdef395e9b50a88585d6e0 /content | |
parent | 6b7a5e329b36cbda1f8e432fbc92cc7acb5ede4c (diff) | |
download | chromium_src-aaed25234a6000a0f35eda3c5c4b1e58d9a401de.zip chromium_src-aaed25234a6000a0f35eda3c5c4b1e58d9a401de.tar.gz chromium_src-aaed25234a6000a0f35eda3c5c4b1e58d9a401de.tar.bz2 |
Pull the file picker code out of TabContents.
BUG=71097
TEST=hammer on the HTML file selection dialogs. No visible change; no crashes, nothing.
Review URL: http://codereview.chromium.org/6680002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 10 | ||||
-rw-r--r-- | content/browser/tab_contents/tab_contents.h | 6 |
2 files changed, 0 insertions, 16 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 3b88d16..2def379 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -31,7 +31,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/favicon_service.h" -#include "chrome/browser/file_select_helper.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_types.h" @@ -441,7 +440,6 @@ bool TabContents::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(ViewHostMsg_SetSuggestions, OnSetSuggestions) IPC_MESSAGE_HANDLER(ViewHostMsg_InstantSupportDetermined, OnInstantSupportDetermined) - IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() @@ -1978,14 +1976,6 @@ void TabContents::OnInstantSupportDetermined(int32 page_id, bool result) { delegate()->OnInstantSupportDetermined(page_id, result); } -void TabContents::OnRunFileChooser( - const ViewHostMsg_RunFileChooser_Params& params) { - if (file_select_helper_.get() == NULL) - file_select_helper_.reset(new FileSelectHelper(profile())); - file_select_helper_->RunFileChooser(render_view_host(), params); -} - - void TabContents::OnContentSettingsAccessed(bool content_was_blocked) { if (delegate_) delegate_->OnContentSettingsChange(this); diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 4495409..e751d6f 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -71,7 +71,6 @@ class WebUI; class DesktopNotificationHandlerForTC; class DownloadItem; class Extension; -class FileSelectHelper; class InfoBarDelegate; class LoadNotificationDetails; class OmniboxSearchHint; @@ -91,7 +90,6 @@ struct RendererPreferences; struct ThumbnailScore; struct ViewHostMsg_DomMessage_Params; struct ViewHostMsg_FrameNavigate_Params; -struct ViewHostMsg_RunFileChooser_Params; struct WebPreferences; // Describes what goes in the main content area of a tab. TabContents is @@ -801,7 +799,6 @@ class TabContents : public PageNavigator, const std::vector<std::string>& suggestions, InstantCompleteBehavior complete_behavior); void OnInstantSupportDetermined(int32 page_id, bool result); - void OnRunFileChooser(const ViewHostMsg_RunFileChooser_Params& params); // Changes the IsLoading state and notifies delegate as needed // |details| is used to provide details on the load that just finished @@ -1082,9 +1079,6 @@ class TabContents : public PageNavigator, // TabContentsSSLHelper, lazily created. scoped_ptr<TabContentsSSLHelper> ssl_helper_; - // FileSelectHelper, lazily created. - scoped_ptr<FileSelectHelper> file_select_helper_; - // Handles drag and drop event forwarding to extensions. BookmarkDrag* bookmark_drag_; |