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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)
Patch Set: Address most comments, except manifest, need to sync. Created 4 years, 2 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/app_list/app_list_service_ash.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc
index 6e9bc5189c3bb16b5262ce0b0a8c719814c1ff54..ea04b9a3e25f8f2e369899783170491d286ffcdb 100644
--- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc
@@ -134,7 +134,7 @@ void AppListServiceAsh::ShowAndSwitchToState(
base::FilePath AppListServiceAsh::GetProfilePath(
const base::FilePath& user_data_dir) {
- return ChromeLauncherController::instance()->GetProfile()->GetPath();
+ return ChromeLauncherController::instance()->profile()->GetPath();
}
void AppListServiceAsh::ShowForProfile(Profile* /*default_profile*/) {
@@ -184,7 +184,7 @@ gfx::NativeWindow AppListServiceAsh::GetAppListWindow() {
}
Profile* AppListServiceAsh::GetCurrentAppListProfile() {
- return ChromeLauncherController::instance()->GetProfile();
+ return ChromeLauncherController::instance()->profile();
}
AppListControllerDelegate* AppListServiceAsh::GetControllerDelegate() {

Powered by Google App Engine
This is Rietveld 408576698