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

Unified Diff: chrome/browser/intents/register_intent_handler_infobar_delegate.cc

Issue 8144013: Add a check to the registry before the intent infobar is shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 9 years, 2 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/intents/register_intent_handler_infobar_delegate.cc
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate.cc b/chrome/browser/intents/register_intent_handler_infobar_delegate.cc
index 4c711e4c95e4a25b67708cf772a0bb007062dca7..7c227ba158d59b45cc9c4ae4cc7f484a83ad6ad1 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate.cc
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate.cc
@@ -4,8 +4,11 @@
#include "chrome/browser/intents/register_intent_handler_infobar_delegate.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
#include "chrome/browser/intents/web_intents_registry.h"
#include "chrome/browser/intents/web_intents_registry_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -60,3 +63,29 @@ bool RegisterIntentHandlerInfoBarDelegate::LinkClicked(
// TODO(jhawkins): Add associated bug for the article here.
return false;
}
+
+// Helper continuation for MaybeShowIntentInfoBar.
+void CheckProvider(
James Hawkins 2011/10/06 17:46:04 Are you sure the params don't fit on this line of
Greg Billock 2011/10/06 20:21:00 Yeah. All four are fairly long. :-/
+ InfoBarTabHelper* infobar_helper,
+ WebIntentsRegistry* registry,
+ const WebIntentServiceData& service,
+ bool provider_exists) {
+ if (!provider_exists) {
+ infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate(
+ infobar_helper, registry, service));
+ }
+}
+
+// static
+void RegisterIntentHandlerInfoBarDelegate::MaybeShowIntentInfoBar(
+ InfoBarTabHelper* infobar_helper,
+ WebIntentsRegistry* registry,
+ const WebIntentServiceData& service) {
+ DCHECK(infobar_helper);
+ DCHECK(registry);
+ registry->IntentProviderExists(service,
+ base::Bind(&CheckProvider,
+ base::Unretained(infobar_helper),
+ base::Unretained(registry),
+ service));
+}

Powered by Google App Engine
This is Rietveld 408576698