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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.h

Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass. (Closed)
Patch Set: Address comments. 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: chrome/browser/ui/ash/launcher/launcher_context_menu.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index c600b41243815e045ee059d343db27b1bb450349..85084858019d9eff7cc25ffbbe67ee15063641ca 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "ui/base/models/simple_menu_model.h"
-class ChromeLauncherControllerImpl;
+class ChromeLauncherController;
namespace ash {
class WmShelf;
@@ -42,7 +42,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
~LauncherContextMenu() override;
// Static function to create contextmenu instance.
- static LauncherContextMenu* Create(ChromeLauncherControllerImpl* controller,
+ static LauncherContextMenu* Create(ChromeLauncherController* controller,
const ash::ShelfItem* item,
ash::WmShelf* wm_shelf);
@@ -54,10 +54,10 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
void ExecuteCommand(int command_id, int event_flags) override;
protected:
- LauncherContextMenu(ChromeLauncherControllerImpl* controller,
+ LauncherContextMenu(ChromeLauncherController* controller,
const ash::ShelfItem* item,
ash::WmShelf* wm_shelf);
- ChromeLauncherControllerImpl* controller() const { return controller_; }
+ ChromeLauncherController* controller() const { return controller_; }
const ash::ShelfItem& item() const { return item_; }
@@ -71,7 +71,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
bool ExecuteCommonCommand(int command_id, int event_flags);
private:
- ChromeLauncherControllerImpl* controller_;
+ ChromeLauncherController* controller_;
ash::ShelfItem item_;

Powered by Google App Engine
This is Rietveld 408576698