Minor infobar cleanup.

chrome/browser/android/banners/app_banner_infobar_delegate.cc

 // Copyright 2015 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/android/banners/app_banner_infobar_delegate.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
@@ skipping 52 matching lines @@
       app_icon,
       web_app_data,
       base::android::ScopedJavaGlobalRef<jobject>(),
       std::string()));
   AppBannerInfoBar* infobar = new AppBannerInfoBar(delegate.Pass(),
                                                    web_app_data.start_url);
   return infobar_manager->AddInfoBar(make_scoped_ptr(infobar))
       ? infobar : nullptr;
 }
 
+AppBannerInfoBarDelegate::~AppBannerInfoBarDelegate() {
+  TrackDismissEvent(DISMISS_EVENT_DISMISSED);
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_AppBannerInfoBarDelegate_destroy(env,
+                                        java_delegate_.obj());
+  java_delegate_.Reset();
+}
+
+void AppBannerInfoBarDelegate::UpdateInstallState(JNIEnv* env, jobject obj) {
+  if (native_app_data_.is_null())
+    return;
+
+  int newState = Java_AppBannerInfoBarDelegate_determineInstallState(
+      env,
+      java_delegate_.obj(),
+      native_app_data_.obj());
+  static_cast<AppBannerInfoBar*>(infobar())->OnInstallStateChanged(newState);
+}
+
+void AppBannerInfoBarDelegate::OnInstallIntentReturned(
+    JNIEnv* env,
+    jobject obj,
+    jboolean jis_installing) {
+  if (!infobar())
+    return;
+
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());
+  if (!web_contents)
+    return;
+
+  if (jis_installing) {
+    AppBannerSettingsHelper::RecordBannerEvent(
+        web_contents,
+        web_contents->GetURL(),
+        native_app_package_,
+        AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
+        AppBannerManager::GetCurrentTime());
+
+    TrackInstallEvent(INSTALL_EVENT_NATIVE_APP_INSTALL_STARTED);
+    rappor::SampleDomainAndRegistryFromGURL("AppBanner.NativeApp.Installed",
+                                            web_contents->GetURL());
+  }
+
+  UpdateInstallState(env, obj);
+}
+
+void AppBannerInfoBarDelegate::OnInstallFinished(JNIEnv* env,
+                                                 jobject obj,
+                                                 jboolean success) {
+  if (!infobar())
+    return;
+
+  if (success) {
+    TrackInstallEvent(INSTALL_EVENT_NATIVE_APP_INSTALL_COMPLETED);
+    UpdateInstallState(env, obj);
+  } else if (infobar()->owner()) {
+    TrackDismissEvent(DISMISS_EVENT_INSTALL_TIMEOUT);
+    infobar()->owner()->RemoveInfoBar(infobar());
+  }
+}
+
 AppBannerInfoBarDelegate::AppBannerInfoBarDelegate(
     const base::string16& app_title,
     SkBitmap* app_icon,
     const content::Manifest& web_app_data,
     const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
     const std::string& native_app_package)
     : app_title_(app_title),
       app_icon_(app_icon),
       web_app_data_(web_app_data),
       native_app_data_(native_app_data),
       native_app_package_(native_app_package) {
   DCHECK(native_app_data_.is_null() ^ web_app_data_.IsEmpty());
   JNIEnv* env = base::android::AttachCurrentThread();
   java_delegate_.Reset(Java_AppBannerInfoBarDelegate_create(
       env,
       reinterpret_cast<intptr_t>(this)));
 }
 
-AppBannerInfoBarDelegate::~AppBannerInfoBarDelegate() {
-  TrackDismissEvent(DISMISS_EVENT_DISMISSED);
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_AppBannerInfoBarDelegate_destroy(env,
-                                        java_delegate_.obj());
-  java_delegate_.Reset();
-}
-
-base::string16 AppBannerInfoBarDelegate::GetMessageText() const {
-  return app_title_;
-}
-
-int AppBannerInfoBarDelegate::GetButtons() const {
-  return BUTTON_OK;
-}
-
 gfx::Image AppBannerInfoBarDelegate::GetIcon() const {
   return gfx::Image::CreateFrom1xBitmap(*app_icon_.get());
 }
 
 void AppBannerInfoBarDelegate::InfoBarDismissed() {
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (!web_contents)
     return;
 
@@ skipping 13 matching lines @@
         web_contents, web_contents->GetURL(),
         web_app_data_.start_url.spec(),
         AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK,
         AppBannerManager::GetCurrentTime());
 
     rappor::SampleDomainAndRegistryFromGURL("AppBanner.WebApp.Dismissed",
                                             web_contents->GetURL());
   }
 }
 
+base::string16 AppBannerInfoBarDelegate::GetMessageText() const {
+  return app_title_;
+}
+
+int AppBannerInfoBarDelegate::GetButtons() const {
+  return BUTTON_OK;
+}
+
 bool AppBannerInfoBarDelegate::Accept() {
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(infobar());
   if (!web_contents) {
     TrackDismissEvent(DISMISS_EVENT_ERROR);
     return true;
   }
 
   if (!native_app_data_.is_null()) {
     JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 60 matching lines @@
 
   Java_AppBannerInfoBarDelegate_showAppDetails(env,
                                                java_delegate_.obj(),
                                                tab->GetJavaObject().obj(),
                                                native_app_data_.obj());
 
   TrackDismissEvent(DISMISS_EVENT_BANNER_CLICK);
   return true;
 }
 
-void AppBannerInfoBarDelegate::OnInstallIntentReturned(
-    JNIEnv* env,
-    jobject obj,
-    jboolean jis_installing) {
-  if (!infobar())
-    return;
-
-  content::WebContents* web_contents =
-      InfoBarService::WebContentsFromInfoBar(infobar());
-  if (!web_contents)
-    return;
-
-  if (jis_installing) {
-    AppBannerSettingsHelper::RecordBannerEvent(
-        web_contents,
-        web_contents->GetURL(),
-        native_app_package_,
-        AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
-        AppBannerManager::GetCurrentTime());
-
-    TrackInstallEvent(INSTALL_EVENT_NATIVE_APP_INSTALL_STARTED);
-    rappor::SampleDomainAndRegistryFromGURL("AppBanner.NativeApp.Installed",
-                                            web_contents->GetURL());
-  }
-
-  UpdateInstallState(env, obj);
-}
-
-void AppBannerInfoBarDelegate::OnInstallFinished(JNIEnv* env,
-                                                 jobject obj,
-                                                 jboolean success) {
-  if (!infobar())
-    return;
-
-  if (success) {
-    TrackInstallEvent(INSTALL_EVENT_NATIVE_APP_INSTALL_COMPLETED);
-    UpdateInstallState(env, obj);
-  } else if (infobar()->owner()) {
-    TrackDismissEvent(DISMISS_EVENT_INSTALL_TIMEOUT);
-    infobar()->owner()->RemoveInfoBar(infobar());
-  }
-}
-
-void AppBannerInfoBarDelegate::UpdateInstallState(JNIEnv* env, jobject obj) {
-  if (native_app_data_.is_null())
-    return;
-
-  int newState = Java_AppBannerInfoBarDelegate_determineInstallState(
-      env,
-      java_delegate_.obj(),
-      native_app_data_.obj());
-  static_cast<AppBannerInfoBar*>(infobar())->OnInstallStateChanged(newState);
-}
-
-
 bool RegisterAppBannerInfoBarDelegate(JNIEnv* env) {
  return RegisterNativesImpl(env);
 }
 
 }  // namespace banners