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

Unified Diff: trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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: trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc (revision 269901)
+++ trunk/src/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc (working copy)
@@ -8,12 +8,8 @@
#include "base/thread_task_runner_handle.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/shell_integration_linux.h"
-#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
#include "chrome/browser/ui/app_list/app_list_controller_delegate_views.h"
#include "chrome/browser/ui/app_list/app_list_shower_views.h"
-#include "chrome/browser/ui/app_list/app_list_view_delegate.h"
-#include "chrome/browser/ui/app_list/scoped_keep_alive.h"
-#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
#include "chrome/browser/ui/views/app_list/linux/app_list_linux.h"
#include "content/public/browser/browser_thread.h"
#include "grit/chromium_strings.h"
@@ -84,14 +80,10 @@
// static
AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
- if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
- return AppListServiceAsh::GetInstance();
-
return AppListServiceLinux::GetInstance();
}
// static
void AppListService::InitAll(Profile* initial_profile) {
- AppListServiceAsh::GetInstance()->Init(initial_profile);
AppListServiceLinux::GetInstance()->Init(initial_profile);
}

Powered by Google App Engine
This is Rietveld 408576698