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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_item_controller.h

Issue 1921403002: Pin apps from prefs on the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only use ChromeMashShelfController with use_ash=1. Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.h b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
index d485c4bedfd543161415e17323f8831e4e3a21ba..8501a84a4e426777a708df3ffb02d5d2f55b9bf7 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
@@ -12,12 +12,12 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/scoped_vector.h"
-#include "base/strings/string16.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
#include "ui/events/event.h"
class ChromeLauncherController;
class ChromeLauncherAppMenuItem;
+class Profile;
typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;
@@ -48,7 +48,7 @@ class LauncherItemController : public ash::ShelfItemDelegate {
Type type() const { return type_; }
ash::ShelfID shelf_id() const { return shelf_id_; }
void set_shelf_id(ash::ShelfID id) { shelf_id_ = id; }
- virtual const std::string& app_id() const;
+ const std::string& app_id() const { return app_id_; }
ChromeLauncherController* launcher_controller() const {
return launcher_controller_;
}
@@ -86,11 +86,6 @@ class LauncherItemController : public ash::ShelfItemDelegate {
// Helper function to get the ash::ShelfItemType for the item type.
ash::ShelfItemType GetShelfItemType() const;
- protected:
- // Helper function to return the title associated with |app_id_|.
- // Returns an empty title if no matching extension can be found.
- base::string16 GetAppTitle() const;
-
private:
const Type type_;
// App id will be empty if there is no app associated with the window.

Powered by Google App Engine
This is Rietveld 408576698