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

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: This patch set has many platform related issue Created 3 years, 7 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
11 #include "ash/public/cpp/shelf_types.h" 11 #include "ash/public/cpp/shelf_types.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" 14 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
15 #include "ui/aura/window.h"
15 16
16 class ArcAppListPrefs; 17 class ArcAppListPrefs;
17 class ExtensionEnableFlow; 18 class ExtensionEnableFlow;
18 class Profile; 19 class Profile;
19 20
20 namespace content { 21 namespace content {
21 class WebContents; 22 class WebContents;
22 } 23 }
23 24
24 // Assists the LauncherController with ExtensionService interaction. 25 // Assists the LauncherController with ExtensionService interaction.
(...skipping 11 matching lines...) Expand all
36 // no app. All known profiles will be queried for this. 37 // no app. All known profiles will be queried for this.
37 virtual std::string GetAppID(content::WebContents* tab); 38 virtual std::string GetAppID(content::WebContents* tab);
38 39
39 // Returns true if |id| is valid for the currently active profile. 40 // Returns true if |id| is valid for the currently active profile.
40 // Used during restore to ignore no longer valid extensions. 41 // Used during restore to ignore no longer valid extensions.
41 // Note that already running applications are ignored by the restore process. 42 // Note that already running applications are ignored by the restore process.
42 virtual bool IsValidIDForCurrentUser(const std::string& id) const; 43 virtual bool IsValidIDForCurrentUser(const std::string& id) const;
43 44
44 void LaunchApp(const ash::ShelfID& id, 45 void LaunchApp(const ash::ShelfID& id,
45 ash::ShelfLaunchSource source, 46 ash::ShelfLaunchSource source,
46 int event_flags); 47 int event_flags,
48 const aura::Window* root_window);
47 49
48 virtual ArcAppListPrefs* GetArcAppListPrefs() const; 50 virtual ArcAppListPrefs* GetArcAppListPrefs() const;
49 51
50 Profile* profile() { return profile_; } 52 Profile* profile() { return profile_; }
51 const Profile* profile() const { return profile_; } 53 const Profile* profile() const { return profile_; }
52 void set_profile(Profile* profile) { profile_ = profile; } 54 void set_profile(Profile* profile) { profile_ = profile; }
53 55
54 private: 56 private:
55 // ExtensionEnableFlowDelegate: 57 // ExtensionEnableFlowDelegate:
56 void ExtensionEnableFlowFinished() override; 58 void ExtensionEnableFlowFinished() override;
57 void ExtensionEnableFlowAborted(bool user_initiated) override; 59 void ExtensionEnableFlowAborted(bool user_initiated) override;
58 60
59 // The currently active profile for the usage of |GetAppID|. 61 // The currently active profile for the usage of |GetAppID|.
60 Profile* profile_; 62 Profile* profile_;
61 std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_; 63 std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_;
62 64
63 DISALLOW_COPY_AND_ASSIGN(LauncherControllerHelper); 65 DISALLOW_COPY_AND_ASSIGN(LauncherControllerHelper);
64 }; 66 };
65 67
66 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_ 68 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTROLLER_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698