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

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

Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy. (Closed)
Patch Set: Fix test. Created 3 years, 11 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 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_ITEM_CONTROLLER _H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_ITEM_CONTROLLER _H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_ITEM_CONTROLLER _H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_ITEM_CONTROLLER _H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 18 matching lines...) Expand all
29 ~ArcAppDeferredLauncherItemController() override; 29 ~ArcAppDeferredLauncherItemController() override;
30 30
31 base::TimeDelta GetActiveTime() const; 31 base::TimeDelta GetActiveTime() const;
32 32
33 int event_flags() const { return event_flags_; } 33 int event_flags() const { return event_flags_; }
34 34
35 // ash::ShelfItemDelegate 35 // ash::ShelfItemDelegate
36 ash::ShelfItemDelegate::PerformedAction ItemSelected( 36 ash::ShelfItemDelegate::PerformedAction ItemSelected(
37 const ui::Event& event) override; 37 const ui::Event& event) override;
38 base::string16 GetTitle() override; 38 base::string16 GetTitle() override;
39 bool CanPin() const override;
40 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 39 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
41 void Close() override; 40 void Close() override;
42 41
43 // LauncherItemController overrides: 42 // LauncherItemController overrides:
44 bool IsVisible() const override; 43 bool IsVisible() const override;
45 void Launch(ash::LaunchSource source, int event_flags) override; 44 void Launch(ash::LaunchSource source, int event_flags) override;
46 ash::ShelfItemDelegate::PerformedAction Activate( 45 ash::ShelfItemDelegate::PerformedAction Activate(
47 ash::LaunchSource source) override; 46 ash::LaunchSource source) override;
48 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 47 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
49 48
50 private: 49 private:
51 // The flags of the event that caused the ARC app to be activated. These will 50 // The flags of the event that caused the ARC app to be activated. These will
52 // be propagated to the launch event once the app is actually launched. 51 // be propagated to the launch event once the app is actually launched.
53 const int event_flags_; 52 const int event_flags_;
54 53
55 base::WeakPtr<ArcAppDeferredLauncherController> host_; 54 base::WeakPtr<ArcAppDeferredLauncherController> host_;
56 const base::Time start_time_; 55 const base::Time start_time_;
57 56
58 DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherItemController); 57 DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherItemController);
59 }; 58 };
60 59
61 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_ITEM_CONTROL LER_H_ 60 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_ITEM_CONTROL LER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698