summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/file_manager_dialogs.cc
diff options
context:
space:
mode:
authorachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 18:45:10 +0000
committerachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 18:45:10 +0000
commit6cfef4d1548e36ecff926bdb148d9d497de4176c (patch)
treefcf9637bb52d1d9b156cd17fbde3c2360545abd5 /chrome/browser/ui/views/file_manager_dialogs.cc
parent9b17bd207d0c4479b5b485cf5802b8b1634d7773 (diff)
downloadchromium_src-6cfef4d1548e36ecff926bdb148d9d497de4176c.zip
chromium_src-6cfef4d1548e36ecff926bdb148d9d497de4176c.tar.gz
chromium_src-6cfef4d1548e36ecff926bdb148d9d497de4176c.tar.bz2
Revert 80026 - Support for fileBrowserPrivate extension file selection apis.
BUG=chromium-os:13045 TEST=NONE Review URL: http://codereview.chromium.org/6712036 TBR=achuith@chromium.org Review URL: http://codereview.chromium.org/6737034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/file_manager_dialogs.cc')
-rw-r--r--chrome/browser/ui/views/file_manager_dialogs.cc50
1 files changed, 1 insertions, 49 deletions
diff --git a/chrome/browser/ui/views/file_manager_dialogs.cc b/chrome/browser/ui/views/file_manager_dialogs.cc
index fbfce50..e723f18 100644
--- a/chrome/browser/ui/views/file_manager_dialogs.cc
+++ b/chrome/browser/ui/views/file_manager_dialogs.cc
@@ -7,7 +7,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/browser/extensions/extension_file_browser_private_api.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_dialogs.h"
@@ -15,8 +14,6 @@
#include "chrome/browser/ui/shell_dialogs.h"
#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "content/browser/browser_thread.h"
-#include "content/common/notification_registrar.h"
-#include "content/common/notification_service.h"
#include "third_party/libjingle/source/talk/base/urlencode.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
@@ -24,8 +21,7 @@
// Shows a dialog box for selecting a file or a folder.
class FileManagerDialog
: public SelectFileDialog,
- public HtmlDialogUIDelegate,
- public NotificationObserver {
+ public HtmlDialogUIDelegate {
public:
explicit FileManagerDialog(Listener* listener);
@@ -125,11 +121,6 @@ class FileManagerDialog
return true;
}
- // NotificationObserver implementation.
- virtual void Observe(NotificationType type,
- const NotificationSource& source,
- const NotificationDetails& details);
-
private:
virtual ~FileManagerDialog() {}
@@ -148,9 +139,6 @@ class FileManagerDialog
// The base url for the file manager extension.
static std::string s_extension_base_url_;
- // Listen for notifications from fileBrowserPrivate.
- NotificationRegistrar registrar_;
-
DISALLOW_COPY_AND_ASSIGN(FileManagerDialog);
};
@@ -190,13 +178,6 @@ void FileManagerDialog::SelectFile(
return;
}
- registrar_.Add(this, NotificationType::FILE_BROWSE_SELECTED,
- NotificationService::AllSources());
- registrar_.Add(this, NotificationType::FILE_BROWSE_MULTI_SELECTED,
- NotificationService::AllSources());
- registrar_.Add(this, NotificationType::FILE_BROWSE_CANCEL_DIALOG,
- NotificationService::AllSources());
-
title_ = UTF16ToWide(title);
owner_window_ = owner_window;
@@ -292,32 +273,3 @@ std::string FileManagerDialog::GetArgumentsJson(
return rv;
}
-
-void FileManagerDialog::Observe(NotificationType type,
- const NotificationSource& source,
- const NotificationDetails& details) {
- if (!listener_)
- return;
-
- switch (type.value) {
- case NotificationType::FILE_BROWSE_SELECTED: {
- SelectFileFunction* func = Source<SelectFileFunction>(source).ptr();
- listener_->FileSelected(func->selected_file(), func->index(), NULL);
- break;
- }
-
- case NotificationType::FILE_BROWSE_MULTI_SELECTED: {
- SelectFilesFunction* func = Source<SelectFilesFunction>(source).ptr();
- listener_->MultiFilesSelected(func->selected_files(), NULL);
- break;
- }
-
- case NotificationType::FILE_BROWSE_CANCEL_DIALOG: {
- listener_->FileSelectionCanceled(NULL);
- break;
- }
-
- default:
- break;
- }
-}