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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.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/arc_app_deferred_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h
index 8b6b1afe0f2bf182e821ccf011c9d3e4172ee84c..feff5ddd5c95072ade062e18c85c50355f6fc6fc 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
class ArcAppDeferredLauncherItemController;
-class ChromeLauncherControllerImpl;
+class ChromeLauncherController;
// ArcAppDeferredLauncherController displays visual feedback that the ARC
// application the user has just activated is waiting for ARC to be ready, and
@@ -25,8 +25,7 @@ class ArcAppDeferredLauncherController
: public ArcAppListPrefs::Observer,
public arc::ArcSessionManager::Observer {
public:
- explicit ArcAppDeferredLauncherController(
- ChromeLauncherControllerImpl* owner);
+ explicit ArcAppDeferredLauncherController(ChromeLauncherController* owner);
~ArcAppDeferredLauncherController() override;
bool HasApp(const std::string& app_id) const;
@@ -66,7 +65,7 @@ class ArcAppDeferredLauncherController
void RegisterNextUpdate();
// Unowned pointers.
- ChromeLauncherControllerImpl* owner_;
+ ChromeLauncherController* owner_;
Profile* observed_profile_ = nullptr;
AppControllerMap app_controller_map_;

Powered by Google App Engine
This is Rietveld 408576698