chrome/browser/ui/browser.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/browser.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: 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

« chrome/browser/chrome_select_file_policy_unittest.cc ('K') | « chrome/browser/ui/base_shell_dialog.h ('k') | chrome/browser/ui/certificate_dialogs.cc » ('j') | chrome/browser/ui/select_file_dialog.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 97c4de883fb7a1b230031eff69e7f4a82e1a5e07..0c5a361941c5190d550f4dd695ca5774d5097b15 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -36,6 +36,7 @@

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/character_encoding.h"

#include "chrome/browser/chrome_page_zoom.h"

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

#include "chrome/browser/content_settings/host_content_settings_map.h"

#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"

@@ -1520,11 +1521,12 @@ void Browser::OpenFile() {

// TODO(beng): figure out how to juggle this.

gfx::NativeWindow parent_window = window_->GetNativeWindow();

- select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,

- string16(), directory,

- NULL, 0, FILE_PATH_LITERAL(""),

- GetActiveWebContents(),

- parent_window, NULL);

+ select_file_dialog_->SelectFile(

+ SelectFileDialog::SELECT_OPEN_FILE,

+ string16(), directory,

+ NULL, 0, FILE_PATH_LITERAL(""),

+ ChromeSelectFilePolicy::DisplayInfobarCallback(GetActiveWebContents()),

+ parent_window, NULL);

}

void Browser::OpenCreateShortcutsDialog() {