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

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

Issue 12207104: Refactor app_list_util.h into AppListService abstract base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for r184604=r184636 Created 7 years, 10 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
new file mode 100644
index 0000000000000000000000000000000000000000..e9e223dfc9876b6f5d429689072a182374169768
--- /dev/null
+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc
@@ -0,0 +1,68 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/app_list/app_list_service_ash.h"
+
+#include "ash/shell.h"
+#include "base/files/file_path.h"
+#include "base/memory/singleton.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/app_list/app_list_service.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
+
+namespace {
+
+class AppListServiceAsh : public AppListService {
+ public:
+ static AppListServiceAsh* GetInstance() {
+ return Singleton<AppListServiceAsh,
+ LeakySingletonTraits<AppListServiceAsh> >::get();
+ }
+
+ private:
+ friend struct DefaultSingletonTraits<AppListServiceAsh>;
+
+ AppListServiceAsh() {}
+
+ // AppListService overrides:
+ virtual base::FilePath GetAppListProfilePath(
+ const base::FilePath& user_data_dir) OVERRIDE;
+ virtual void ShowAppList(Profile* default_profile) OVERRIDE;
+ virtual bool IsAppListVisible() const OVERRIDE;
+ virtual void DismissAppList() OVERRIDE;
+
+ DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh);
+};
+
+base::FilePath AppListServiceAsh::GetAppListProfilePath(
+ const base::FilePath& user_data_dir) {
+ return ChromeLauncherController::instance()->profile()->GetPath();
+}
+
+void AppListServiceAsh::ShowAppList(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).
+ if (!ash::Shell::GetInstance()->GetAppListTargetVisibility())
+ ash::Shell::GetInstance()->ToggleAppList(NULL);
+}
+
+bool AppListServiceAsh::IsAppListVisible() const {
+ return ash::Shell::GetInstance()->GetAppListTargetVisibility();
+}
+
+void AppListServiceAsh::DismissAppList() {
+ if (IsAppListVisible())
+ ash::Shell::GetInstance()->ToggleAppList(NULL);
+}
+
+} // namespace
+
+namespace chrome {
+
+AppListService* GetAppListServiceAsh() {
+ return AppListServiceAsh::GetInstance();
+}
+
+} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698