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

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

Issue 1161233005: Implement app banner info bars on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stop-icon-overgeneration
Patch Set: Fixing display bug on Android Created 5 years, 7 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
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 93afdf6eda13a102ef7235937f32de9babd309a4..087c064e26fdbe80702172c67a61763bdc2a7808 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -491,6 +491,13 @@ void BookmarkAppHelper::Create(const CreateBookmarkAppCallback& callback) {
}
}
+void BookmarkAppHelper::CreateFromAppBanner(
+ const CreateBookmarkAppCallback& callback,
+ const content::Manifest& manifest) {
+ callback_ = callback;
+ OnDidGetManifest(manifest);
benwells 2015/06/02 05:53:36 We should have some dchecks to make sure the manif
dominickn (DO NOT USE) 2015/06/02 06:51:33 In progress.
+}
+
void BookmarkAppHelper::OnDidGetManifest(const content::Manifest& manifest) {
if (contents_->IsBeingDestroyed())
return;
@@ -564,13 +571,17 @@ void BookmarkAppHelper::OnIconsDownloaded(
OnBubbleCompleted(true, web_app_info_);
return;
}
+ ShowBookmarkAppBubble();
+}
+void BookmarkAppHelper::ShowBookmarkAppBubble() {
benwells 2015/06/02 05:53:36 Is there a reason to split this out, or was it jus
dominickn (DO NOT USE) 2015/06/02 06:51:33 It was initially necessary, but is now just for cl
Browser* browser = chrome::FindBrowserWithWebContents(contents_);
if (!browser) {
// The browser can be null in tests.
OnBubbleCompleted(true, web_app_info_);
return;
}
+
browser->window()->ShowBookmarkAppBubble(
web_app_info_, base::Bind(&BookmarkAppHelper::OnBubbleCompleted,
base::Unretained(this)));

Powered by Google App Engine
This is Rietveld 408576698