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

Unified Diff: chrome/browser/ui/webui/options2/browser_options_handler.h

Issue 10820034: Remove redirection header and add "ui::" before all SelectFileDialog usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reuploading for different try run. 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/webui/options2/browser_options_handler.h
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.h b/chrome/browser/ui/webui/options2/browser_options_handler.h
index 546e5f0c5102ca687e69340080afc990f6e109a2..71ee40a7b3d8c273b1543462da52311e5dc7ca34 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler.h
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.h
@@ -13,8 +13,8 @@
#include "chrome/browser/search_engines/template_url_service_observer.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/sync/profile_sync_service_observer.h"
-#include "chrome/browser/ui/select_file_dialog.h"
#include "chrome/browser/ui/webui/options2/options_ui.h"
+#include "ui/base/dialogs/select_file_dialog.h"
#include "ui/base/models/table_model_observer.h"
#if defined(OS_CHROMEOS)
@@ -35,7 +35,7 @@ class BrowserOptionsHandler
: public OptionsPageUIHandler,
public CloudPrintSetupHandlerDelegate,
public ProfileSyncServiceObserver,
- public SelectFileDialog::Listener,
+ public ui::SelectFileDialog::Listener,
public ShellIntegration::DefaultWebClientObserver,
#if defined(OS_CHROMEOS)
public chromeos::system::PointerDeviceObserver::Observer,
@@ -297,7 +297,7 @@ class BrowserOptionsHandler
// True if the multiprofiles switch is enabled.
bool multiprofile_;
- scoped_refptr<SelectFileDialog> select_folder_dialog_;
+ scoped_refptr<ui::SelectFileDialog> select_folder_dialog_;
#if !defined(OS_CHROMEOS)
BooleanPrefMember enable_metrics_recording_;

Powered by Google App Engine
This is Rietveld 408576698