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

Unified Diff: chrome/browser/extensions/bookmark_app_helper.cc

Issue 2639463002: Add a pref name for share targets, and store their manifest data. (Closed)
Patch Set: Added tests. Created 3 years, 11 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/profiles/profile.cc » ('j') | chrome/browser/profiles/profile.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/bookmark_app_helper.cc
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index a70c1b294760af858479e5a0fa4d389438adb6c1..3551a18b62c80df49952f120fe568d78e8fddd0a 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -28,8 +28,10 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/web_applications/web_app.h"
+#include "chrome/browser/webshare/share_target_pref_helper.cc"
Matt Giuca 2017/01/23 03:00:57 You can't include a .cc file. Need a header file.
constantina 2017/01/24 02:03:42 Ah yeah, I just wanted to get it to work. Added he
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
+#include "chrome/common/origin_trials/chrome_origin_trial_policy.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/platform_locale_settings.h"
#include "components/prefs/pref_service.h"
@@ -583,6 +585,12 @@ void BookmarkAppHelper::OnDidGetManifest(const GURL& manifest_url,
UpdateWebAppInfoFromManifest(manifest, &web_app_info_);
+ if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
+ AddShareTargetToPrefs(manifest_url.GetOrigin().spec(),
+ manifest.share_target.url_template,
mlamouri (slow - plz ping) 2017/01/23 00:24:06 Following up from my comment on the manifest's CL,
Matt Giuca 2017/01/23 03:00:57 Needs formatting (some alignment issue).
constantina 2017/01/24 02:03:42 Done.
constantina 2017/01/24 02:03:42 Done.
+ profile_->GetPrefs());
+ }
+
// Add urls from the WebApplicationInfo.
std::vector<GURL> web_app_info_icon_urls;
for (std::vector<WebApplicationInfo::IconInfo>::const_iterator it =
« no previous file with comments | « no previous file | chrome/browser/profiles/profile.cc » ('j') | chrome/browser/profiles/profile.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698