Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7309)

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 10695066: Move SelectFileDialog implementation to ui/base/dialogs/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reupload because weirdness Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index c114ce2f4c6a6c248a5f04a8315d5f746b4613d8..7f05865a54c54ac9c29cf84fbb3b09c5516566ec 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -13,6 +13,11 @@
#include "ui/aura/single_display_manager.h"
#include "ui/gfx/screen.h"
+#if defined(FILE_MANAGER_EXTENSION)
+#include "chrome/browser/ui/views/select_file_dialog_extension.h"
+#include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
+#endif
+
ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
}
@@ -27,6 +32,10 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
stacking_client_.reset(new aura::DesktopStackingClient);
gfx::Screen::SetInstance(aura::CreateDesktopScreen());
}
+
+#if defined(FILE_MANAGER_EXTENSION)
+ ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
+#endif
}
void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {

Powered by Google App Engine
This is Rietveld 408576698