chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h - Issue 10820034: Remove redirection header and add "ui::" before all SelectFileDialog usage.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options2/chromeos/set_wallpaper_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

« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc ('k') | chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h

diff --git a/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h b/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h

index 8209cf2f4da639db9c9f1312254aca5a2d3c2b84..b7395aacfd5d80a8057ffbcf48e616a97b08ed81 100644

--- a/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h

+++ b/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h

@@ -7,8 +7,8 @@

#include "ash/desktop_background/desktop_background_resources.h"

#include "base/memory/weak_ptr.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/gfx/native_widget_types.h"

namespace base {

@@ -32,7 +32,7 @@ namespace options2 {

// ChromeOS user image options page UI handler.

class SetWallpaperOptionsHandler : public ::options2::OptionsPageUIHandler,

- public SelectFileDialog::Listener,

+ public ui::SelectFileDialog::Listener,

public WallpaperDelegate {

public:

SetWallpaperOptionsHandler();

@@ -83,7 +83,7 @@ class SetWallpaperOptionsHandler : public ::options2::OptionsPageUIHandler,

gfx::NativeWindow GetBrowserWindow() const;

// Shows a dialog box for selecting a file.

- scoped_refptr<SelectFileDialog> select_file_dialog_;

+ scoped_refptr<ui::SelectFileDialog> select_file_dialog_;

base::WeakPtrFactory<SetWallpaperOptionsHandler> weak_factory_;