chrome/browser/ui/webui/options2/browser_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/browser_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/extensions/pack_extension_handler.cc ('k') | chrome/browser/ui/webui/options2/certificate_manager_handler2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc

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

index b5c54dfe5077742072d5e16523c4597d18c8cdbe..4ccf5f5b158787fc74f4492d55d5c5be0affb93d 100644

--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc

@@ -46,6 +46,7 @@

#include "chrome/browser/sync/sync_ui_util.h"

#include "chrome/browser/themes/theme_service.h"

#include "chrome/browser/themes/theme_service_factory.h"

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

#include "chrome/browser/ui/options/options_util.h"

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

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

@@ -1034,12 +1035,13 @@ scoped_ptr<DictionaryValue> BrowserOptionsHandler::GetSyncStateDictionary() {

void BrowserOptionsHandler::HandleSelectDownloadLocation(

const ListValue* args) {

PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();

- select_folder_dialog_ = SelectFileDialog::Create(this);

+ select_folder_dialog_ = SelectFileDialog::Create(

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

select_folder_dialog_->SelectFile(

SelectFileDialog::SELECT_FOLDER,

l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE),

pref_service->GetFilePath(prefs::kDownloadDefaultDirectory),

- NULL, 0, FILE_PATH_LITERAL(""), web_ui()->GetWebContents(),

+ NULL, 0, FILE_PATH_LITERAL(""),

web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL);

}