chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc - 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.cc

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/set_wallpaper_options_handler.h ('k') | chrome/browser/ui/webui/options2/media_galleries_handler.h » ('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.cc

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

index 47ec5ae0db9e551f3d65edaa6efa8f829fde4683..51da83619e5eaba5bfc7465e5d218ff5ba028665 100644

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

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

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

namespace {

// Returns info about extensions for files we support as wallpaper images.

-SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() {

- SelectFileDialog::FileTypeInfo file_type_info;

+ui::SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() {

+ ui::SelectFileDialog::FileTypeInfo file_type_info;

file_type_info.extensions.resize(3);

file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg"));

@@ -184,7 +184,7 @@ void SetWallpaperOptionsHandler::HandlePageShown(const base::ListValue* args) {

void SetWallpaperOptionsHandler::HandleChooseFile(const ListValue* args) {

DCHECK(args && args->empty());

- select_file_dialog_ = SelectFileDialog::Create(

+ select_file_dialog_ = ui::SelectFileDialog::Create(

this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));

FilePath downloads_path;

@@ -192,10 +192,10 @@ void SetWallpaperOptionsHandler::HandleChooseFile(const ListValue* args) {

NOTREACHED();

// Static so we initialize it only once.

- CR_DEFINE_STATIC_LOCAL(SelectFileDialog::FileTypeInfo, file_type_info,

+ CR_DEFINE_STATIC_LOCAL(ui::SelectFileDialog::FileTypeInfo, file_type_info,

(GetUserImageFileTypeInfo()));

- select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,

+ select_file_dialog_->SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE,

l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE),

downloads_path, &file_type_info, 0,

FILE_PATH_LITERAL(""),