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

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

index fd35f3197bce85b1dfb994bb8485dc80c7b76a7f..bba300efe5de77ccec9b66b11db94f34f725029e 100644

--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

@@ -31,6 +31,7 @@

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

#include "chrome/browser/tab_contents/background_contents.h"

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

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

#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

#include "chrome/browser/view_type_utils.h"

#include "chrome/common/chrome_notification_types.h"

@@ -730,10 +731,11 @@ void ExtensionSettingsHandler::HandleLoadUnpackedExtensionMessage(

const int kFileTypeIndex = 0; // No file type information to index.

const SelectFileDialog::Type kSelectType = SelectFileDialog::SELECT_FOLDER;

- load_extension_dialog_ = SelectFileDialog::Create(this);

+ load_extension_dialog_ = SelectFileDialog::Create(

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

load_extension_dialog_->SelectFile(

kSelectType, select_title, last_unpacked_directory_, NULL,

- kFileTypeIndex, FILE_PATH_LITERAL(""), web_ui()->GetWebContents(),

+ kFileTypeIndex, FILE_PATH_LITERAL(""),

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

}