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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_controller_helper.h

Issue 2894743002: Make launching apps from shelf more intuitive (Closed)
Patch Set: Affected by new revision, gclient sync and re-upload. Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 25 matching lines...) Expand all
36 // no app. All known profiles will be queried for this. 36 // no app. All known profiles will be queried for this.
37 virtual std::string GetAppID(content::WebContents* tab); 37 virtual std::string GetAppID(content::WebContents* tab);
38 38
39 // Returns true if |id| is valid for the currently active profile. 39 // Returns true if |id| is valid for the currently active profile.
40 // Used during restore to ignore no longer valid extensions. 40 // Used during restore to ignore no longer valid extensions.
41 // Note that already running applications are ignored by the restore process. 41 // Note that already running applications are ignored by the restore process.
42 virtual bool IsValidIDForCurrentUser(const std::string& id) const; 42 virtual bool IsValidIDForCurrentUser(const std::string& id) const;
43 43
44 void LaunchApp(const ash::ShelfID& id, 44 void LaunchApp(const ash::ShelfID& id,
45 ash::ShelfLaunchSource source, 45 ash::ShelfLaunchSource source,
46 int event_flags); 46 int event_flags,
47 int64_t display_id);
47 48
48 virtual ArcAppListPrefs* GetArcAppListPrefs() const; 49 virtual ArcAppListPrefs* GetArcAppListPrefs() const;
49 50
50 Profile* profile() { return profile_; } 51 Profile* profile() { return profile_; }
51 const Profile* profile() const { return profile_; } 52 const Profile* profile() const { return profile_; }
52 void set_profile(Profile* profile) { profile_ = profile; } 53 void set_profile(Profile* profile) { profile_ = profile; }
53 54
54 private: 55 private:
55 // ExtensionEnableFlowDelegate: 56 // ExtensionEnableFlowDelegate:
56 void ExtensionEnableFlowFinished() override; 57 void ExtensionEnableFlowFinished() override;
57 void ExtensionEnableFlowAborted(bool user_initiated) override; 58 void ExtensionEnableFlowAborted(bool user_initiated) override;
58 59
59 // The currently active profile for the usage of |GetAppID|. 60 // The currently active profile for the usage of |GetAppID|.
60 Profile* profile_; 61 Profile* profile_;
61 std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_; 62 std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_;
62 63
63 DISALLOW_COPY_AND_ASSIGN(LauncherControllerHelper); 64 DISALLOW_COPY_AND_ASSIGN(LauncherControllerHelper);
64 }; 65 };
65 66
66 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_ 67 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_
OLDNEW
« 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