Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2768)

Unified Diff: ash/metrics/user_metrics_recorder.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/focus_cycler_unittest.cc ('k') | ash/mus/context_menu_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/metrics/user_metrics_recorder.cc
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
index fb6a630b27adfa4099d0b101472591af42bca8db..aa04f364d6136b56be350e9260a72d73b547b307 100644
--- a/ash/metrics/user_metrics_recorder.cc
+++ b/ash/metrics/user_metrics_recorder.cc
@@ -10,9 +10,9 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/session/session_controller.h"
#include "ash/session/session_state_delegate.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_model.h"
#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/wm/window_state.h"
#include "ash/wm_window.h"
@@ -624,7 +624,7 @@ void UserMetricsRecorder::OnShellShuttingDown() {
}
void UserMetricsRecorder::RecordPeriodicMetrics() {
- WmShelf* shelf = WmShelf::ForWindow(Shell::GetPrimaryRootWindow());
+ Shelf* shelf = Shelf::ForWindow(Shell::GetPrimaryRootWindow());
// TODO(bruthig): Investigating whether the check for |manager| is necessary
// and add tests if it is.
if (shelf) {
« no previous file with comments | « ash/focus_cycler_unittest.cc ('k') | ash/mus/context_menu_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698