Cleanup ash shelf accessor functions.

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/metrics/desktop_task_switch_metric_recorder.h"
 #include "ash/session/session_state_delegate.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_item_types.h"
-#include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/window_state.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/user_metrics.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
@@ skipping 590 matching lines @@
     desktop_task_switch_metric_recorder_.reset(
         new DesktopTaskSwitchMetricRecorder());
   }
 }
 
 void UserMetricsRecorder::OnShellShuttingDown() {
   desktop_task_switch_metric_recorder_.reset();
 }
 
 void UserMetricsRecorder::RecordPeriodicMetrics() {
-  ShelfLayoutManager* manager =
-      ShelfLayoutManager::ForShelf(Shell::GetPrimaryRootWindow());
+  Shelf* shelf = Shelf::ForPrimaryDisplay();
   // TODO(bruthig): Investigating whether the check for |manager| is necessary
   // and add tests if it is.
-  if (manager) {
+  if (shelf) {
     // TODO(bruthig): Consider tracking the time spent in each alignment.
     UMA_HISTOGRAM_ENUMERATION("Ash.ShelfAlignmentOverTime",
-                              manager->SelectValueForShelfAlignment(
+                              shelf->SelectValueForShelfAlignment(
                                   SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM,
                                   SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT,
-                                  SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT,
-                                  -1),
+                                  SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT, -1),
                               SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT);
   }
 
   if (IsUserInActiveDesktopEnvironment()) {
     RecordShelfItemCounts();
     UMA_HISTOGRAM_COUNTS_100("Ash.NumberOfVisibleWindowsInPrimaryDisplay",
                              GetNumVisibleWindowsInPrimaryDisplay());
   }
 
   // TODO(bruthig): Find out if this should only be logged when the user is
   // active.
   // TODO(bruthig): Consider tracking how long a particular type of window is
   // active at a time.
   UMA_HISTOGRAM_ENUMERATION("Ash.ActiveWindowShowTypeOverTime",
                             GetActiveWindowState(),
                             ACTIVE_WINDOW_STATE_TYPE_COUNT);
 }
 
 bool UserMetricsRecorder::IsUserInActiveDesktopEnvironment() const {
   return IsUserActive() && !IsKioskModeActive();
 }
 
 void UserMetricsRecorder::StartTimer() {
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromSeconds(kAshPeriodicMetricsTimeInSeconds),
                this, &UserMetricsRecorder::RecordPeriodicMetrics);
 }
 
 }  // namespace ash