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

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

Issue 1960293003: Remove OS_CHROMEOS from ui/ash code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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 686204084338ab10e0ff1ba135dd2f4f49020264..ad21e5dc4054a2edf4116245628310001c01fdea 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
@@ -140,7 +140,6 @@ base::FilePath AppListServiceAsh::GetProfilePath(
void AppListServiceAsh::ShowForProfile(Profile* /*default_profile*/) {
// This may not work correctly if the profile passed in is different from the
// one the ash Shell is currently using.
- // TODO(ananta): Handle profile changes correctly when !defined(OS_CHROMEOS).
app_list_presenter_->Show(ash::Shell::GetTargetDisplayId());
}
@@ -203,10 +202,6 @@ void AppListServiceAsh::DestroyAppList() {
DismissAppList();
}
-// Windows and Linux Ash additionally supports a native UI. See
-// app_list_service_{win,linux}.cc.
-#if defined(OS_CHROMEOS)
-
// static
AppListService* AppListService::Get() {
return AppListServiceAsh::GetInstance();
@@ -217,5 +212,3 @@ void AppListService::InitAll(Profile* initial_profile,
const base::FilePath& profile_path) {
AppListServiceAsh::GetInstance()->Init(initial_profile);
}
-
-#endif // !defined(OS_WIN)
« no previous file with comments | « chrome/browser/ui/ash/accelerator_controller_browsertest.cc ('k') | chrome/browser/ui/ash/app_sync_ui_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698