Group is_active_in_admin_bar with other public methods.

Author: aaemnnosttv

includes/Modules/Analytics.php

@@ -206,6 +206,22 @@ public function on_deactivation() {
 		$this->options->delete( 'googlesitekit_analytics_adsense_linked' );
 	}
 
+	/**
+	 * Checks if the module is active in the admin bar for the given URL.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @param string $url URL to determine active state for.
+	 * @return bool
+	 */
+	public function is_active_in_admin_bar( $url ) {
+		if ( ! $this->is_connected() ) {
+			return false;
+		}
+
+		return $this->has_data_for_url( $url );
+	}
+
 	/**
 	 * Outputs gtag snippet.
 	 *
@@ -1240,22 +1256,6 @@ protected function setup_settings() {
 		return new Settings( $this->options );
 	}
 
-	/**
-	 * Checks if the module is active in the admin bar for the given URL.
-	 *
-	 * @since n.e.x.t
-	 *
-	 * @param string $url URL to determine active state for.
-	 * @return bool
-	 */
-	public function is_active_in_admin_bar( $url ) {
-		if ( ! $this->is_connected() ) {
-			return false;
-		}
-
-		return $this->has_data_for_url( $url );
-	}
-
 	/**
 	 * Checks whether Analytics data exists for the given URL.
 	 *

includes/Modules/Search_Console.php

@@ -109,6 +109,22 @@ public function get_scopes() {
 		);
 	}
 
+	/**
+	 * Checks if the module is active in the admin bar for the given URL.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @param string $url URL to determine active state for.
+	 * @return bool
+	 */
+	public function is_active_in_admin_bar( $url ) {
+		if ( ! $this->get_property_id() ) {
+			return false;
+		}
+
+		return $this->has_data_for_url( $url );
+	}
+
 	/**
 	 * Returns the mapping between available datapoints and their services.
 	 *
@@ -486,20 +502,4 @@ protected function setup_services( Google_Site_Kit_Client $client ) {
 	protected function setup_settings() {
 		return new Settings( $this->options );
 	}
-
-	/**
-	 * Checks if the module is active in the admin bar for the given URL.
-	 *
-	 * @since n.e.x.t
-	 *
-	 * @param string $url URL to determine active state for.
-	 * @return bool
-	 */
-	public function is_active_in_admin_bar( $url ) {
-		if ( ! $this->get_property_id() ) {
-			return false;
-		}
-
-		return $this->has_data_for_url( $url );
-	}
 }