Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: chrome/browser/bookmarks/bookmark_extension_api.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
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/chrome_select_file_policy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_extension_api.cc
diff --git a/chrome/browser/bookmarks/bookmark_extension_api.cc b/chrome/browser/bookmarks/bookmark_extension_api.cc
index a5eedb1ac194f6699d4b4326cb1b9e85af717ad9..10660daca186527b30bc20bfd81db5b69ab4d4d5 100644
--- a/chrome/browser/bookmarks/bookmark_extension_api.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_api.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/bookmarks/bookmark_html_writer.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
+#include "chrome/browser/chrome_select_file_policy.h"
#include "chrome/browser/extensions/extension_event_router.h"
#include "chrome/browser/extensions/extension_function_dispatcher.h"
#include "chrome/browser/extensions/extensions_quota_service.h"
@@ -886,15 +887,16 @@ void BookmarksIOFunction::ShowSelectFileDialog(SelectFileDialog::Type type,
// |tab_contents| can be NULL (for background pages), which is fine. In such
// a case if file-selection dialogs are forbidden by policy, we will not
// show an InfoBar, which is better than letting one appear out of the blue.
- select_file_dialog_->SelectFile(type,
- string16(),
- default_path,
- &file_type_info,
- 0,
- FILE_PATH_LITERAL(""),
- web_contents,
- NULL,
- NULL);
+ select_file_dialog_->SelectFile(
+ type,
+ string16(),
+ default_path,
+ &file_type_info,
+ 0,
+ FILE_PATH_LITERAL(""),
+ ChromeSelectFilePolicy::DisplayInfobarCallback(web_contents),
+ NULL,
+ NULL);
}
void BookmarksIOFunction::FileSelectionCanceled(void* params) {
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/chrome_select_file_policy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698