mash: Refactor ChromeLauncherController's ShelfDelegate code.

ash/metrics/user_metrics_recorder.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 "ash/metrics/user_metrics_recorder.h"
 
 #include "ash/common/metrics/pointer_metrics_recorder.h"
 #include "ash/common/session/session_state_delegate.h"
-#include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/metrics/desktop_task_switch_metric_recorder.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 142 matching lines @@
         maximized_or_fullscreen_window_present = true;
         break;
       }
     }
   }
   return visible_window_count;
 }
 
 // Records the number of items in the shelf as an UMA statistic.
 void RecordShelfItemCounts() {
-  ShelfDelegate* shelf_delegate = Shell::Get()->shelf_delegate();
-  DCHECK(shelf_delegate);
-
   int pinned_item_count = 0;
   int unpinned_item_count = 0;
-
-  for (const ShelfItem& shelf_item : Shell::Get()->shelf_model()->items()) {
-    if (shelf_item.type != TYPE_APP_LIST) {
-      // Internal ash apps do not have an app id and thus will always be counted
-      // as unpinned.
-      if (shelf_delegate->HasShelfIDToAppIDMapping(shelf_item.id) &&
-          shelf_delegate->IsAppPinned(
-              shelf_delegate->GetAppIDForShelfID(shelf_item.id))) {
-        ++pinned_item_count;
-      } else {
-        ++unpinned_item_count;
-      }
-    }
+  for (const ShelfItem& item : Shell::Get()->shelf_model()->items()) {
+    if (item.type == TYPE_PINNED_APP || item.type == TYPE_BROWSER_SHORTCUT)
+      ++pinned_item_count;
+    else if (item.type != TYPE_APP_LIST)
+      ++unpinned_item_count;
   }
 
   UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.NumberOfItems",
                            pinned_item_count + unpinned_item_count);
   UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.NumberOfPinnedItems", pinned_item_count);
   UMA_HISTOGRAM_COUNTS_100("Ash.Shelf.NumberOfUnpinnedItems",
                            unpinned_item_count);
 }
 
 }  // namespace
@@ skipping 441 matching lines @@
   return IsUserActive() && !IsKioskModeActive() && !IsArcKioskModeActive();
 }
 
 void UserMetricsRecorder::StartTimer() {
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromSeconds(kAshPeriodicMetricsTimeInSeconds),
                this, &UserMetricsRecorder::RecordPeriodicMetrics);
 }
 
 }  // namespace ash