Refactored Toolbar event.

src/class-core-events.php

@@ -64,12 +64,7 @@ class Core_Events extends Laps_Events {
 		);
 
 		$stops['admin_bar_menu'][-1] = array(
-			'event'    => 'Admin Bar',
+			'event'    => 'Toolbar',
-			'category' => 'core',
-		);
-		$stops['admin_bar_menu'][ PHP_INT_MAX -1 ] = array(
-			'action'   => 'stop',
-			'event'    => 'Admin Bar',
 			'category' => 'core',
 		);
 

src/class-laps.php

@@ -229,6 +229,8 @@ class Laps {
 			)
 		);
 
+		self::$stopwatch->stop( 'Toolbar' );
+
 		$events     = self::$stopwatch->getSectionEvents( '__root__' );
 		$start      = $timestart * 1000;
 		$end        = microtime( true ) * 1000;