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

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

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)
Patch Set: Address comments. Created 4 years, 2 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_controller_helper.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_controller_helper.h b/chrome/browser/ui/ash/launcher/launcher_controller_helper.h
index 77e9f8a34c0f05846eb2b2029f640abbe871f8b7..78dba52f8ff9b75dd3ac450ada707c6c276910c4 100644
--- a/chrome/browser/ui/ash/launcher/launcher_controller_helper.h
+++ b/chrome/browser/ui/ash/launcher/launcher_controller_helper.h
@@ -41,9 +41,6 @@ class LauncherControllerHelper : public ExtensionEnableFlowDelegate {
// Note that already running applications are ignored by the restore process.
virtual bool IsValidIDForCurrentUser(const std::string& id) const;
- // Sets the currently active profile for the usage of |GetAppID|.
- virtual void SetCurrentUser(Profile* profile);
-
void LaunchApp(const std::string& app_id,
ash::LaunchSource source,
int event_flags);
@@ -52,12 +49,14 @@ class LauncherControllerHelper : public ExtensionEnableFlowDelegate {
Profile* profile() { return profile_; }
const Profile* profile() const { return profile_; }
+ void set_profile(Profile* profile) { profile_ = profile; }
private:
// ExtensionEnableFlowDelegate:
void ExtensionEnableFlowFinished() override;
void ExtensionEnableFlowAborted(bool user_initiated) override;
+ // The currently active profile for the usage of |GetAppID|.
Profile* profile_;
std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_;
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_context_menu.cc ('k') | chrome/browser/ui/ash/launcher/launcher_controller_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698