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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_controller_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
« no previous file with comments | « chrome/browser/ui/app_list/app_list_util.cc ('k') | chrome/browser/ui/ash/app_list/app_list_service_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
index ad730c6d251a18ee88143aaf636b54c01bf4c60b..74eab464a7a793385503e7378ea4a05f3665baff 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
#include "ash/shell.h"
-#include "chrome/browser/ui/app_list/app_list_util.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
AppListControllerDelegateAsh::AppListControllerDelegateAsh() {}
@@ -64,27 +63,3 @@ void AppListControllerDelegateAsh::LaunchApp(
event_flags);
DismissView();
}
-
-#if !defined(OS_WIN)
-namespace chrome {
-
-// In the win_aura build these are defined in app_list_controller_win.cc.
-void ShowAppList(Profile* default_profile) {
- if (!ash::Shell::GetInstance()->GetAppListTargetVisibility())
- ash::Shell::GetInstance()->ToggleAppList(NULL);
-}
-
-bool IsAppListVisible() {
- return ash::Shell::GetInstance()->GetAppListWindow() != NULL;
-}
-
-void DismissAppList() {
- if (IsAppListVisible())
- ash::Shell::GetInstance()->ToggleAppList(NULL);
-}
-
-void SetAppListProfile(const base::FilePath& profile_file_path) {
-}
-
-} // namespace chrome
-#endif
« no previous file with comments | « chrome/browser/ui/app_list/app_list_util.cc ('k') | chrome/browser/ui/ash/app_list/app_list_service_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698