OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "chrome/browser/ui/webui/app_list/start_page_handler.h" | 5 #include "chrome/browser/ui/webui/app_list/start_page_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 #include "base/version.h" | 13 #include "base/version.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 15 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
16 #include "chrome/browser/ui/app_list/app_list_service.h" | 16 #include "chrome/browser/ui/app_list/app_list_service.h" |
17 #include "chrome/browser/ui/app_list/start_page_service.h" | 17 #include "chrome/browser/ui/app_list/start_page_service.h" |
18 #include "chrome/browser/ui/host_desktop.h" | 18 #include "chrome/browser/ui/host_desktop.h" |
19 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 19 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
20 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
21 #include "components/update_client/update_query_params.h" | 21 #include "components/update_client/update_query_params.h" |
22 #include "content/public/browser/web_ui.h" | 22 #include "content/public/browser/web_ui.h" |
23 #include "extensions/browser/extension_registry.h" | 23 #include "extensions/browser/extension_registry.h" |
24 #include "extensions/browser/extension_system.h" | 24 #include "extensions/browser/extension_system.h" |
25 #include "extensions/common/constants.h" | 25 #include "extensions/common/constants.h" |
26 #include "extensions/common/extension.h" | 26 #include "extensions/common/extension.h" |
27 #include "extensions/common/extension_icon_set.h" | 27 #include "extensions/common/extension_icon_set.h" |
28 #include "ui/app_list/app_list_switches.h" | 28 #include "ui/app_list/app_list_switches.h" |
29 #include "ui/events/event_constants.h" | 29 #include "ui/events/event_constants.h" |
| 30 #include "ui/gfx/host_desktop_type.h" |
30 | 31 |
31 namespace app_list { | 32 namespace app_list { |
32 | 33 |
33 namespace { | 34 namespace { |
34 | 35 |
35 const char kAppListDoodleActionHistogram[] = "Apps.AppListDoodleAction"; | 36 const char kAppListDoodleActionHistogram[] = "Apps.AppListDoodleAction"; |
36 | 37 |
37 // Interactions a user has with the app list doodle. This enum must not have its | 38 // Interactions a user has with the app list doodle. This enum must not have its |
38 // order altered as it is used in histograms. | 39 // order altered as it is used in histograms. |
39 enum DoodleAction { | 40 enum DoodleAction { |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 chrome::GetHostDesktopTypeForNativeView( | 107 chrome::GetHostDesktopTypeForNativeView( |
107 web_ui()->GetWebContents()->GetNativeView()))-> | 108 web_ui()->GetWebContents()->GetNativeView()))-> |
108 GetControllerDelegate(); | 109 GetControllerDelegate(); |
109 controller->ActivateApp(profile, | 110 controller->ActivateApp(profile, |
110 app, | 111 app, |
111 AppListControllerDelegate::LAUNCH_FROM_APP_LIST, | 112 AppListControllerDelegate::LAUNCH_FROM_APP_LIST, |
112 ui::EF_NONE); | 113 ui::EF_NONE); |
113 } | 114 } |
114 | 115 |
115 } // namespace app_list | 116 } // namespace app_list |
OLD | NEW |