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

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

Issue 2540713003: Revert of Propagate information about how ARC apps are launched (Closed)
Patch Set: Created 4 years 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string>
10 9
11 #include "base/macros.h" 10 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
13 #include "base/time/time.h" 12 #include "base/time/time.h"
14 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 13 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
15 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h" 14 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
16 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" 15 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
17 16
18 class ArcAppDeferredLauncherItemController; 17 class ArcAppDeferredLauncherItemController;
19 class ChromeLauncherControllerImpl; 18 class ChromeLauncherControllerImpl;
20 19
21 // ArcAppDeferredLauncherController displays visual feedback that the ARC
22 // application the user has just activated is waiting for ARC to be ready, and
23 // will be asynchronously launched as soon as it can.
24 class ArcAppDeferredLauncherController 20 class ArcAppDeferredLauncherController
25 : public ArcAppListPrefs::Observer, 21 : public ArcAppListPrefs::Observer,
26 public arc::ArcSessionManager::Observer { 22 public arc::ArcSessionManager::Observer {
27 public: 23 public:
28 explicit ArcAppDeferredLauncherController( 24 explicit ArcAppDeferredLauncherController(
29 ChromeLauncherControllerImpl* owner); 25 ChromeLauncherControllerImpl* owner);
30 ~ArcAppDeferredLauncherController() override; 26 ~ArcAppDeferredLauncherController() override;
31 27
32 bool HasApp(const std::string& app_id) const; 28 bool HasApp(const std::string& app_id) const;
33 29
34 base::TimeDelta GetActiveTime(const std::string& app_id) const; 30 base::TimeDelta GetActiveTime(const std::string& app_id) const;
35 31
36 // Registers deferred ARC app launch. |app_id| is the app to be launched, and 32 // Registers deferred Arc app launch.
37 // |event_flags| describes the original event flags that triggered the app's 33 void RegisterDeferredLaunch(const std::string& app_id);
38 // activation.
39 void RegisterDeferredLaunch(const std::string& app_id, int event_flags);
40 34
41 // Applies spinning effect if requested app is handled by deferred controller. 35 // Applies spinning effect if requested app is handled by deferred controller.
42 void MaybeApplySpinningEffect(const std::string& app_id, 36 void MaybeApplySpinningEffect(const std::string& app_id,
43 gfx::ImageSkia* image); 37 gfx::ImageSkia* image);
44 38
45 // ArcAppListPrefs::Observer: 39 // ArcAppListPrefs::Observer:
46 void OnAppReadyChanged(const std::string& app_id, bool ready) override; 40 void OnAppReadyChanged(const std::string& app_id, bool ready) override;
47 void OnAppRemoved(const std::string& app_id) override; 41 void OnAppRemoved(const std::string& app_id) override;
48 42
49 // arc::ArcSessionManager::Observer: 43 // arc::ArcSessionManager::Observer:
(...skipping 21 matching lines...) Expand all
71 65
72 AppControllerMap app_controller_map_; 66 AppControllerMap app_controller_map_;
73 67
74 // Always keep this the last member of this class. 68 // Always keep this the last member of this class.
75 base::WeakPtrFactory<ArcAppDeferredLauncherController> weak_ptr_factory_; 69 base::WeakPtrFactory<ArcAppDeferredLauncherController> weak_ptr_factory_;
76 70
77 DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherController); 71 DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherController);
78 }; 72 };
79 73
80 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H _ 74 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_CONTROLLER_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698