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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 2039543002: Getting rid of ChromeLauncherController::model(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 8d1c9a2d4cbe8a440d192c6076a26e19b7a2b4f5..25b3262f4ee0fd10b3ef2a8e6c05cef1da3a91e0 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -841,10 +841,6 @@ void ChromeLauncherController::PersistPinnedState() {
base::Unretained(this)));
}
-ash::ShelfModel* ChromeLauncherController::model() {
- return model_;
-}
-
Profile* ChromeLauncherController::profile() {
return profile_;
}
@@ -1704,7 +1700,8 @@ ChromeLauncherController::GetBrowserShortcutLauncherItemController() {
if (item.type == ash::TYPE_BROWSER_SHORTCUT)
return static_cast<BrowserShortcutLauncherItemController*>(i->second);
}
- NOTREACHED() << "There should be always a BrowserLauncherItemController.";
+ NOTREACHED()
+ << "There should be always a BrowserShortcutLauncherItemController.";
msw 2016/06/03 17:55:27 optional nit: "always be"
mfomitchev 2016/06/03 18:09:45 Done.
return nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698