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

Unified Diff: chrome/browser/ui/browser_dialogs.h

Issue 2667803002: Picker takes a vector of pairs, and passes back the user chosen target. (Closed)
Patch Set: Dynamically enable/disable button Created 3 years, 10 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/ui/views/webshare/webshare_target_picker_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_dialogs.h
diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h
index 2cdf3e1ee738966c8ad0ab7da083a080a545c388..45fa64a69177b13e4d310a109c96dc4cec23c6e3 100644
--- a/chrome/browser/ui/browser_dialogs.h
+++ b/chrome/browser/ui/browser_dialogs.h
@@ -10,9 +10,10 @@
#include <vector>
#include "base/callback.h"
+#include "base/optional.h"
+#include "base/strings/string16.h"
#include "build/build_config.h"
#include "chrome/browser/ui/bookmarks/bookmark_editor.h"
-#include "chrome/browser/webshare/share_service_impl.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/native_widget_types.h"
@@ -159,13 +160,13 @@ payments::PaymentRequestDialog* CreatePaymentRequestDialog(
payments::PaymentRequest* request);
// Shows the dialog to choose a share target app. |targets| is a list of app
-// titles that will be shown in a list. Calls |callback| with SHARE if an app
-// was chosen, or CANCEL if the dialog was cancelled.
-// TODO(mgiuca): Callback should provide info about the picked app.
+// title and manifest URL pairs that will be shown in a list. If the user picks
+// a target, this calls |callback| with the manifest URL of the chosen target,
+// or supplies null if the user cancelled the share.
void ShowWebShareTargetPickerDialog(
gfx::NativeWindow parent_window,
- const std::vector<base::string16>& targets,
- const base::Callback<void(SharePickerResult)>& callback);
+ const std::vector<std::pair<base::string16, GURL>>& targets,
+ const base::Callback<void(base::Optional<std::string>)>& callback);
#if defined(OS_MACOSX)
« no previous file with comments | « no previous file | chrome/browser/ui/views/webshare/webshare_target_picker_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698