Minor infobar cleanup.

chrome/browser/extensions/api/messaging/incognito_connectability.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/messaging/incognito_connectability.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 19 matching lines @@
 
 class IncognitoConnectabilityInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   typedef base::Callback<void(
       IncognitoConnectability::ScopedAlertTracker::Mode)> InfoBarCallback;
 
   // Creates a confirmation infobar and delegate and adds the infobar to
   // |infobar_service|.
   static InfoBar* Create(InfoBarManager* infobar_manager,
                          const base::string16& message,
-                         const InfoBarCallback& callback) {
-    return infobar_manager->AddInfoBar(infobar_manager->CreateConfirmInfoBar(
-        scoped_ptr<ConfirmInfoBarDelegate>(
-            new IncognitoConnectabilityInfoBarDelegate(message, callback))));
-  }
+                         const InfoBarCallback& callback);
 
-  // Set the infobar answered so that the callback is not executed when the
+  // Marks the infobar as answered so that the callback is not executed when the
   // delegate is destroyed.
-  void SetAnswered() { answered_ = true; }
+  void set_answered() { answered_ = true; }
 
  private:
   IncognitoConnectabilityInfoBarDelegate(const base::string16& message,
-                                         const InfoBarCallback& callback)
-      : message_(message), answered_(false), callback_(callback) {}
-
-  ~IncognitoConnectabilityInfoBarDelegate() override {
-    if (!answered_) {
-      // The infobar has closed without the user expressing an explicit
-      // preference. The current request should be denied but further requests
-      // should show an interactive prompt.
-      callback_.Run(IncognitoConnectability::ScopedAlertTracker::INTERACTIVE);
-    }
-  }
+                                         const InfoBarCallback& callback);
+  ~IncognitoConnectabilityInfoBarDelegate() override;
 
   // ConfirmInfoBarDelegate:
-  base::string16 GetMessageText() const override { return message_; }
-  base::string16 GetButtonLabel(InfoBarButton button) const override {
-    return l10n_util::GetStringUTF16(
-        (button == BUTTON_OK) ? IDS_PERMISSION_ALLOW : IDS_PERMISSION_DENY);
-  }
-
-  bool Accept() override {
-    callback_.Run(IncognitoConnectability::ScopedAlertTracker::ALWAYS_ALLOW);
-    answered_ = true;
-    return true;
-  }
-  bool Cancel() override {
-    callback_.Run(IncognitoConnectability::ScopedAlertTracker::ALWAYS_DENY);
-    answered_ = true;
-    return true;
-  }
-
-  // InfoBarDelegate:
-  Type GetInfoBarType() const override { return PAGE_ACTION_TYPE; }
+  Type GetInfoBarType() const override;
+  base::string16 GetMessageText() const override;
+  base::string16 GetButtonLabel(InfoBarButton button) const override;
+  bool Accept() override;
+  bool Cancel() override;
 
   base::string16 message_;
   bool answered_;
   InfoBarCallback callback_;
 };
 
+// static
+InfoBar* IncognitoConnectabilityInfoBarDelegate::Create(
+    InfoBarManager* infobar_manager,
+    const base::string16& message,
+    const IncognitoConnectabilityInfoBarDelegate::InfoBarCallback& callback) {
+  return infobar_manager->AddInfoBar(infobar_manager->CreateConfirmInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate>(
+          new IncognitoConnectabilityInfoBarDelegate(message, callback))));
+}
+
+IncognitoConnectabilityInfoBarDelegate::IncognitoConnectabilityInfoBarDelegate(
+    const base::string16& message,
+    const InfoBarCallback& callback)
+    : message_(message), answered_(false), callback_(callback) {
+}
+
+IncognitoConnectabilityInfoBarDelegate::
+    ~IncognitoConnectabilityInfoBarDelegate() {
+  if (!answered_) {
+    // The infobar has closed without the user expressing an explicit
+    // preference. The current request should be denied but further requests
+    // should show an interactive prompt.
+    callback_.Run(IncognitoConnectability::ScopedAlertTracker::INTERACTIVE);
+  }
+}
+
+infobars::InfoBarDelegate::Type
+IncognitoConnectabilityInfoBarDelegate::GetInfoBarType() const {
+  return PAGE_ACTION_TYPE;
+}
+
+base::string16 IncognitoConnectabilityInfoBarDelegate::GetMessageText() const {
+  return message_;
+}
+
+base::string16 IncognitoConnectabilityInfoBarDelegate::GetButtonLabel(
+    InfoBarButton button) const {
+  return l10n_util::GetStringUTF16(
+      (button == BUTTON_OK) ? IDS_PERMISSION_ALLOW : IDS_PERMISSION_DENY);
+}
+
+bool IncognitoConnectabilityInfoBarDelegate::Accept() {
+  callback_.Run(IncognitoConnectability::ScopedAlertTracker::ALWAYS_ALLOW);
+  answered_ = true;
+  return true;
+}
+
+bool IncognitoConnectabilityInfoBarDelegate::Cancel() {
+  callback_.Run(IncognitoConnectability::ScopedAlertTracker::ALWAYS_DENY);
+  answered_ = true;
+  return true;
+}
+
 }  // namespace
 
 IncognitoConnectability::ScopedAlertTracker::ScopedAlertTracker(Mode mode)
     : last_checked_invocation_count_(g_alert_count) {
   DCHECK_EQ(INTERACTIVE, g_alert_mode);
   DCHECK_NE(INTERACTIVE, mode);
   g_alert_mode = mode;
 }
 
 IncognitoConnectability::ScopedAlertTracker::~ScopedAlertTracker() {
@@ skipping 124 matching lines @@
     // other infobars and answer all the callbacks.
     for (const auto& map_entry : pending_origin) {
       InfoBarManager* other_infobar_manager = map_entry.first;
       const TabContext& other_tab_context = map_entry.second;
       if (other_infobar_manager != infobar_manager) {
         // Disarm the delegate so that it doesn't think the infobar has been
         // dismissed.
         IncognitoConnectabilityInfoBarDelegate* delegate =
             static_cast<IncognitoConnectabilityInfoBarDelegate*>(
                 other_tab_context.infobar->delegate());
-        delegate->SetAnswered();
+        delegate->set_answered();
         other_infobar_manager->RemoveInfoBar(other_tab_context.infobar);
       }
       callbacks.insert(callbacks.end(), other_tab_context.callbacks.begin(),
                        other_tab_context.callbacks.end());
     }
     pending_origins_.erase(make_pair(extension_id, origin));
   }
 
   DCHECK(!callbacks.empty());
   for (const auto& callback : callbacks) {
@@ skipping 13 matching lines @@
     BrowserContextKeyedAPIFactory<IncognitoConnectability> > g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<IncognitoConnectability>*
 IncognitoConnectability::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 }  // namespace extensions