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

Unified Diff: ash/shelf/shelf_view.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index 266002935b7ff0f05567f5070ea7a5ba71269520..3ab75fe3aceccfb8be3673fd6eb7ab785289dc05 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -24,9 +24,9 @@
#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
+#include "ash/shell_port.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/wm/root_window_finder.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/auto_reset.h"
#include "base/memory/ptr_util.h"
@@ -466,11 +466,11 @@ void ShelfView::ButtonPressed(views::Button* sender,
case TYPE_PINNED_APP:
case TYPE_BROWSER_SHORTCUT:
case TYPE_APP:
- WmShell::Get()->RecordUserMetricsAction(UMA_LAUNCHER_CLICK_ON_APP);
+ ShellPort::Get()->RecordUserMetricsAction(UMA_LAUNCHER_CLICK_ON_APP);
break;
case TYPE_APP_LIST:
- WmShell::Get()->RecordUserMetricsAction(
+ ShellPort::Get()->RecordUserMetricsAction(
UMA_LAUNCHER_CLICK_ON_APPLIST_BUTTON);
break;
@@ -1628,7 +1628,7 @@ void ShelfView::ShowContextMenuForView(views::View* source,
const ShelfItem* item = ShelfItemForView(source);
if (!item) {
- WmShell::Get()->ShowContextMenu(point, source_type);
+ ShellPort::Get()->ShowContextMenu(point, source_type);
return;
}

Powered by Google App Engine
This is Rietveld 408576698