chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc - Issue 10667026: Start consolidating cross-port file selection code into ui/base/dialogs.

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_handler2.cc

Issue 10667026: Start consolidating cross-port file selection code into ui/base/dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Attempt to fix win Created 8 years, 6 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_handler2.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_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_handler2.cc

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

index a70d784e50afa57986f4400b406f69a0079a2deb..a7f7c786720d63b25226973f58d5c1f707ad6f5f 100644

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

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

@@ -17,6 +17,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/browser_window.h"

+#include "chrome/browser/ui/chrome_select_file_policy.h"

#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h"

#include "chrome/browser/ui/webui/web_ui_util.h"

#include "chrome/common/chrome_paths.h"

@@ -176,8 +177,8 @@ void SetWallpaperOptionsHandler::HandlePageShown(const base::ListValue* args) {

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

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

- if (!select_file_dialog_.get())

- select_file_dialog_ = SelectFileDialog::Create(this);

+ select_file_dialog_ = SelectFileDialog::Create(

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

FilePath downloads_path;

if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path))

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

l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE),

downloads_path, &file_type_info, 0,

FILE_PATH_LITERAL(""),

- web_ui()->GetWebContents(),

GetBrowserWindow(), NULL);

}