OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_ |
6 #define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_ | 6 #define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_ |
7 | 7 |
| 8 #include "ash/public/cpp/shelf_types.h" |
8 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 10 #include "base/macros.h" |
10 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 11 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h" | |
12 | 12 |
13 namespace app_list { | 13 namespace app_list { |
14 class AppListPresenterImpl; | 14 class AppListPresenterImpl; |
15 } | 15 } |
16 | 16 |
17 class AppListControllerDelegateAsh : public AppListControllerDelegate { | 17 class AppListControllerDelegateAsh : public AppListControllerDelegate { |
18 public: | 18 public: |
19 explicit AppListControllerDelegateAsh(app_list::AppListPresenterImpl*); | 19 explicit AppListControllerDelegateAsh(app_list::AppListPresenterImpl*); |
20 ~AppListControllerDelegateAsh() override; | 20 ~AppListControllerDelegateAsh() override; |
21 | 21 |
(...skipping 21 matching lines...) Expand all Loading... |
43 AppListSource source, | 43 AppListSource source, |
44 int event_flags) override; | 44 int event_flags) override; |
45 void LaunchApp(Profile* profile, | 45 void LaunchApp(Profile* profile, |
46 const extensions::Extension* extension, | 46 const extensions::Extension* extension, |
47 AppListSource source, | 47 AppListSource source, |
48 int event_flags) override; | 48 int event_flags) override; |
49 void ShowForProfileByPath(const base::FilePath& profile_path) override; | 49 void ShowForProfileByPath(const base::FilePath& profile_path) override; |
50 bool ShouldShowUserIcon() override; | 50 bool ShouldShowUserIcon() override; |
51 | 51 |
52 private: | 52 private: |
53 ash::LaunchSource AppListSourceToLaunchSource(AppListSource source); | 53 ash::ShelfLaunchSource AppListSourceToLaunchSource(AppListSource source); |
54 | 54 |
55 // Not owned. | 55 // Not owned. |
56 app_list::AppListPresenterImpl* app_list_presenter_; | 56 app_list::AppListPresenterImpl* app_list_presenter_; |
57 | 57 |
58 DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateAsh); | 58 DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateAsh); |
59 }; | 59 }; |
60 | 60 |
61 #endif // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_ | 61 #endif // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_ |
OLD | NEW |