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

Side by Side 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: Fix things that slipped through rebase cracks 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
6 #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 6 #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/optional.h"
Matt Giuca 2017/01/31 07:28:02 Need base/strings/string16 as well.
constantina 2017/01/31 23:29:42 Done.
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "chrome/browser/ui/bookmarks/bookmark_editor.h" 15 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
15 #include "chrome/browser/webshare/share_service_impl.h"
16 #include "third_party/skia/include/core/SkColor.h" 16 #include "third_party/skia/include/core/SkColor.h"
17 #include "ui/gfx/native_widget_types.h" 17 #include "ui/gfx/native_widget_types.h"
18 18
19 #if defined(OS_CHROMEOS) 19 #if defined(OS_CHROMEOS)
20 #include "chrome/browser/chromeos/arc/intent_helper/arc_navigation_throttle.h" 20 #include "chrome/browser/chromeos/arc/intent_helper/arc_navigation_throttle.h"
21 #endif // OS_CHROMEOS 21 #endif // OS_CHROMEOS
22 22
23 class Browser; 23 class Browser;
24 class ContentSettingBubbleModel; 24 class ContentSettingBubbleModel;
25 class GURL; 25 class GURL;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 payments::PaymentRequestDialog* CreatePaymentRequestDialog( 158 payments::PaymentRequestDialog* CreatePaymentRequestDialog(
159 payments::PaymentRequest* request); 159 payments::PaymentRequest* request);
160 160
161 // Shows the dialog to choose a share target app. |targets| is a list of app 161 // Shows the dialog to choose a share target app. |targets| is a list of app
162 // titles that will be shown in a list. Calls |callback| with SHARE if an app 162 // titles that will be shown in a list. Calls |callback| with SHARE if an app
163 // was chosen, or CANCEL if the dialog was cancelled. 163 // was chosen, or CANCEL if the dialog was cancelled.
164 // TODO(mgiuca): Callback should provide info about the picked app. 164 // TODO(mgiuca): Callback should provide info about the picked app.
165 void ShowWebShareTargetPickerDialog( 165 void ShowWebShareTargetPickerDialog(
166 gfx::NativeWindow parent_window, 166 gfx::NativeWindow parent_window,
167 const std::vector<base::string16>& targets, 167 const std::vector<base::string16>& targets,
168 const base::Callback<void(SharePickerResult)>& callback); 168 const base::Callback<void(base::Optional<base::string16>)>& callback);
169 169
170 #if defined(OS_MACOSX) 170 #if defined(OS_MACOSX)
171 171
172 // This is a class so that it can be friended from ContentSettingBubbleContents, 172 // This is a class so that it can be friended from ContentSettingBubbleContents,
173 // which allows it to call SetAnchorRect(). 173 // which allows it to call SetAnchorRect().
174 class ContentSettingBubbleViewsBridge { 174 class ContentSettingBubbleViewsBridge {
175 public: 175 public:
176 static void Show(gfx::NativeView parent_view, 176 static void Show(gfx::NativeView parent_view,
177 ContentSettingBubbleModel* model, 177 ContentSettingBubbleModel* model,
178 content::WebContents* web_contents, 178 content::WebContents* web_contents,
(...skipping 23 matching lines...) Expand all
202 using BubbleShowPtr = 202 using BubbleShowPtr =
203 void (*)(content::WebContents*, 203 void (*)(content::WebContents*,
204 const std::vector<arc::ArcNavigationThrottle::AppInfo>&, 204 const std::vector<arc::ArcNavigationThrottle::AppInfo>&,
205 const IntentPickerResponse&); 205 const IntentPickerResponse&);
206 206
207 BubbleShowPtr ShowIntentPickerBubble(); 207 BubbleShowPtr ShowIntentPickerBubble();
208 208
209 #endif // OS_CHROMEOS 209 #endif // OS_CHROMEOS
210 210
211 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ 211 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_
OLDNEW
« 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