OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 package org.chromium.chrome.browser.webshare; | 5 package org.chromium.chrome.browser.webshare; |
6 | 6 |
7 import android.app.Activity; | 7 import android.app.Activity; |
8 import android.content.ComponentName; | 8 import android.content.ComponentName; |
9 import android.support.annotation.Nullable; | 9 import android.support.annotation.Nullable; |
10 | 10 |
11 import org.chromium.base.metrics.RecordHistogram; | 11 import org.chromium.base.metrics.RecordHistogram; |
12 import org.chromium.chrome.browser.share.ShareHelper; | 12 import org.chromium.chrome.browser.share.ShareHelper; |
| 13 import org.chromium.chrome.browser.share.ShareParams; |
13 import org.chromium.content_public.browser.WebContents; | 14 import org.chromium.content_public.browser.WebContents; |
14 import org.chromium.mojo.system.MojoException; | 15 import org.chromium.mojo.system.MojoException; |
15 import org.chromium.ui.base.WindowAndroid; | 16 import org.chromium.ui.base.WindowAndroid; |
16 import org.chromium.url.mojom.Url; | 17 import org.chromium.url.mojom.Url; |
17 import org.chromium.webshare.mojom.ShareError; | 18 import org.chromium.webshare.mojom.ShareError; |
18 import org.chromium.webshare.mojom.ShareService; | 19 import org.chromium.webshare.mojom.ShareService; |
19 | 20 |
20 /** | 21 /** |
21 * Android implementation of the ShareService service defined in | 22 * Android implementation of the ShareService service defined in |
22 * third_party/WebKit/public/platform/modules/webshare/webshare.mojom. | 23 * third_party/WebKit/public/platform/modules/webshare/webshare.mojom. |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 } | 70 } |
70 | 71 |
71 @Override | 72 @Override |
72 public void onCancel() { | 73 public void onCancel() { |
73 RecordHistogram.recordEnumeratedHistogram("WebShare.ShareOutcome
", | 74 RecordHistogram.recordEnumeratedHistogram("WebShare.ShareOutcome
", |
74 WEBSHARE_OUTCOME_CANCELED, WEBSHARE_OUTCOME_COUNT); | 75 WEBSHARE_OUTCOME_CANCELED, WEBSHARE_OUTCOME_COUNT); |
75 callback.call(ShareError.CANCELED); | 76 callback.call(ShareError.CANCELED); |
76 } | 77 } |
77 }; | 78 }; |
78 | 79 |
79 ShareHelper.share(false, false, mActivity, title, text, url.url, null, n
ull, innerCallback); | 80 ShareParams params = new ShareParams.Builder(mActivity, title, url.url) |
| 81 .setText(text) |
| 82 .setCallback(innerCallback) |
| 83 .build(); |
| 84 ShareHelper.share(params); |
80 } | 85 } |
81 | 86 |
82 @Nullable | 87 @Nullable |
83 private static Activity activityFromWebContents(@Nullable WebContents webCon
tents) { | 88 private static Activity activityFromWebContents(@Nullable WebContents webCon
tents) { |
84 if (webContents == null) return null; | 89 if (webContents == null) return null; |
85 | 90 |
86 WindowAndroid window = webContents.getTopLevelNativeWindow(); | 91 WindowAndroid window = webContents.getTopLevelNativeWindow(); |
87 if (window == null) return null; | 92 if (window == null) return null; |
88 | 93 |
89 return window.getActivity().get(); | 94 return window.getActivity().get(); |
90 } | 95 } |
91 } | 96 } |
OLD | NEW |