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

Side by Side Diff: chrome/browser/ui/ash/launcher/browser_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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 9 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 bool IsListOfActiveBrowserEmpty(); 43 bool IsListOfActiveBrowserEmpty();
44 44
45 // LauncherItemController overrides: 45 // LauncherItemController overrides:
46 bool IsVisible() const override; 46 bool IsVisible() const override;
47 void Launch(ash::LaunchSource source, int event_flags) override; 47 void Launch(ash::LaunchSource source, int event_flags) override;
48 ShelfItemDelegate::PerformedAction Activate( 48 ShelfItemDelegate::PerformedAction Activate(
49 ash::LaunchSource source) override; 49 ash::LaunchSource source) override;
50 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 50 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
51 ash::ShelfItemDelegate::PerformedAction ItemSelected( 51 ash::ShelfItemDelegate::PerformedAction ItemSelected(
52 const ui::Event& event) override; 52 const ui::Event& event) override;
53 base::string16 GetTitle() override;
54 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 53 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
55 void Close() override; 54 void Close() override;
56 55
57 private: 56 private:
58 // Get the favicon for the browser list entry for |web_contents|. 57 // Get the favicon for the browser list entry for |web_contents|.
59 // Note that for incognito windows the incognito icon will be returned. 58 // Note that for incognito windows the incognito icon will be returned.
60 gfx::Image GetBrowserListIcon(content::WebContents* web_contents) const; 59 gfx::Image GetBrowserListIcon(content::WebContents* web_contents) const;
61 60
62 // Get the title for the browser list entry for |web_contents|. 61 // Get the title for the browser list entry for |web_contents|.
63 // If |web_contents| has not loaded, returns "Net Tab". 62 // If |web_contents| has not loaded, returns "Net Tab".
(...skipping 13 matching lines...) Expand all
77 76
78 // Get a list of active browsers. 77 // Get a list of active browsers.
79 BrowserList::BrowserVector GetListOfActiveBrowsers(); 78 BrowserList::BrowserVector GetListOfActiveBrowsers();
80 79
81 ash::ShelfModel* shelf_model_; 80 ash::ShelfModel* shelf_model_;
82 81
83 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController); 82 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController);
84 }; 83 };
85 84
86 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_ 85 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698