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

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

Issue 2627533002: Replace ShelfItemDelegate::GetTitle() with ShelfItem::title. (Closed)
Patch Set: Address comments. 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 (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_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 30 matching lines...) Expand all
41 std::vector<content::WebContents*> GetRunningApplications(); 41 std::vector<content::WebContents*> GetRunningApplications();
42 42
43 // LauncherItemController overrides: 43 // LauncherItemController overrides:
44 bool IsVisible() const override; 44 bool IsVisible() const override;
45 void Launch(ash::LaunchSource source, int event_flags) override; 45 void Launch(ash::LaunchSource source, int event_flags) override;
46 ash::ShelfItemDelegate::PerformedAction Activate( 46 ash::ShelfItemDelegate::PerformedAction Activate(
47 ash::LaunchSource source) override; 47 ash::LaunchSource source) override;
48 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 48 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
49 ash::ShelfItemDelegate::PerformedAction ItemSelected( 49 ash::ShelfItemDelegate::PerformedAction ItemSelected(
50 const ui::Event& event) override; 50 const ui::Event& event) override;
51 base::string16 GetTitle() override;
52 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 51 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
53 void Close() override; 52 void Close() override;
54 53
55 // Get the refocus url pattern, which can be used to identify this application 54 // Get the refocus url pattern, which can be used to identify this application
56 // from a URL link. 55 // from a URL link.
57 const GURL& refocus_url() const { return refocus_url_; } 56 const GURL& refocus_url() const { return refocus_url_; }
58 // Set the refocus url pattern. Used by unit tests. 57 // Set the refocus url pattern. Used by unit tests.
59 void set_refocus_url(const GURL& refocus_url) { refocus_url_ = refocus_url; } 58 void set_refocus_url(const GURL& refocus_url) { refocus_url_ = refocus_url; }
60 59
61 ChromeLauncherController* controller() { return chrome_launcher_controller_; } 60 ChromeLauncherController* controller() { return chrome_launcher_controller_; }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // Since V2 applications can be undetectable after launching, this timer is 98 // Since V2 applications can be undetectable after launching, this timer is
100 // keeping track of the last launch attempt. 99 // keeping track of the last launch attempt.
101 base::Time last_launch_attempt_; 100 base::Time last_launch_attempt_;
102 101
103 ChromeLauncherController* chrome_launcher_controller_; 102 ChromeLauncherController* chrome_launcher_controller_;
104 103
105 DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController); 104 DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController);
106 }; 105 };
107 106
108 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_ H_ 107 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698