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

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

Issue 2558963002: Move shelf item tooltip flag from delegate to item. (Closed)
Patch Set: Remove WmWindowMus::SetBoolProperty override. 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_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 21 matching lines...) Expand all
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; 39 bool CanPin() const override;
40 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 40 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
41 bool IsDraggable() override; 41 bool IsDraggable() override;
42 bool ShouldShowTooltip() override;
43 void Close() override; 42 void Close() override;
44 43
45 // LauncherItemController overrides: 44 // LauncherItemController overrides:
46 bool IsVisible() const override; 45 bool IsVisible() const override;
47 void Launch(ash::LaunchSource source, int event_flags) override; 46 void Launch(ash::LaunchSource source, int event_flags) override;
48 ash::ShelfItemDelegate::PerformedAction Activate( 47 ash::ShelfItemDelegate::PerformedAction Activate(
49 ash::LaunchSource source) override; 48 ash::LaunchSource source) override;
50 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 49 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
51 50
52 private: 51 private:
53 // The flags of the event that caused the ARC app to be activated. These will 52 // The flags of the event that caused the ARC app to be activated. These will
54 // be propagated to the launch event once the app is actually launched. 53 // be propagated to the launch event once the app is actually launched.
55 const int event_flags_; 54 const int event_flags_;
56 55
57 base::WeakPtr<ArcAppDeferredLauncherController> host_; 56 base::WeakPtr<ArcAppDeferredLauncherController> host_;
58 const base::Time start_time_; 57 const base::Time start_time_;
59 58
60 DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherItemController); 59 DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherItemController);
61 }; 60 };
62 61
63 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_ITEM_CONTROL LER_H_ 62 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_DEFERRED_LAUNCHER_ITEM_CONTROL LER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698