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.h" | |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "base/version.h" | 13 #include "base/version.h" |
13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/search/hotword_service.h" | 15 #include "chrome/browser/search/hotword_service.h" |
15 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 16 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
16 #include "chrome/browser/ui/app_list/app_list_service.h" | 17 #include "chrome/browser/ui/app_list/app_list_service.h" |
17 #include "chrome/browser/ui/app_list/start_page_service.h" | 18 #include "chrome/browser/ui/app_list/start_page_service.h" |
18 #include "chrome/browser/ui/host_desktop.h" | 19 #include "chrome/browser/ui/host_desktop.h" |
19 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 20 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
20 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
(...skipping 19 matching lines...) Expand all Loading... | |
40 } // namespace | 41 } // namespace |
41 | 42 |
42 StartPageHandler::StartPageHandler() : extension_registry_observer_(this) { | 43 StartPageHandler::StartPageHandler() : extension_registry_observer_(this) { |
43 } | 44 } |
44 | 45 |
45 StartPageHandler::~StartPageHandler() { | 46 StartPageHandler::~StartPageHandler() { |
46 } | 47 } |
47 | 48 |
48 void StartPageHandler::RegisterMessages() { | 49 void StartPageHandler::RegisterMessages() { |
49 web_ui()->RegisterMessageCallback( | 50 web_ui()->RegisterMessageCallback( |
51 "doodleClicked", base::Bind(&StartPageHandler::HandleDoodleClicked, | |
52 base::Unretained(this))); | |
53 web_ui()->RegisterMessageCallback( | |
50 "initialize", | 54 "initialize", |
51 base::Bind(&StartPageHandler::HandleInitialize, base::Unretained(this))); | 55 base::Bind(&StartPageHandler::HandleInitialize, base::Unretained(this))); |
52 web_ui()->RegisterMessageCallback( | 56 web_ui()->RegisterMessageCallback( |
53 "launchApp", | 57 "launchApp", |
54 base::Bind(&StartPageHandler::HandleLaunchApp, base::Unretained(this))); | 58 base::Bind(&StartPageHandler::HandleLaunchApp, base::Unretained(this))); |
55 web_ui()->RegisterMessageCallback( | 59 web_ui()->RegisterMessageCallback( |
56 "speechResult", | 60 "speechResult", |
57 base::Bind(&StartPageHandler::HandleSpeechResult, | 61 base::Bind(&StartPageHandler::HandleSpeechResult, |
58 base::Unretained(this))); | 62 base::Unretained(this))); |
59 web_ui()->RegisterMessageCallback( | 63 web_ui()->RegisterMessageCallback( |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
106 base::Version(kOldHotwordExtensionVersionString)) <= 0 && | 110 base::Version(kOldHotwordExtensionVersionString)) <= 0 && |
107 !HotwordService::IsExperimentalHotwordingEnabled()) { | 111 !HotwordService::IsExperimentalHotwordingEnabled()) { |
108 StartPageService* service = StartPageService::Get(profile); | 112 StartPageService* service = StartPageService::Get(profile); |
109 web_ui()->CallJavascriptFunction( | 113 web_ui()->CallJavascriptFunction( |
110 "appList.startPage.setHotwordEnabled", | 114 "appList.startPage.setHotwordEnabled", |
111 base::FundamentalValue(service->HotwordEnabled())); | 115 base::FundamentalValue(service->HotwordEnabled())); |
112 } | 116 } |
113 } | 117 } |
114 #endif | 118 #endif |
115 | 119 |
120 void StartPageHandler::HandleDoodleClicked(const base::ListValue* args) { | |
121 UMA_HISTOGRAM_ENUMERATION("Apps.AppListDoodleClicked", 1, 2); | |
Alexei Svitkine (slow)
2015/02/19 14:56:23
Please use UMA_HISTOGRAM_BOOLEAN(), which produces
| |
122 } | |
123 | |
116 void StartPageHandler::HandleInitialize(const base::ListValue* args) { | 124 void StartPageHandler::HandleInitialize(const base::ListValue* args) { |
117 Profile* profile = Profile::FromWebUI(web_ui()); | 125 Profile* profile = Profile::FromWebUI(web_ui()); |
118 StartPageService* service = StartPageService::Get(profile); | 126 StartPageService* service = StartPageService::Get(profile); |
119 if (!service) | 127 if (!service) |
120 return; | 128 return; |
121 | 129 |
122 service->WebUILoaded(); | 130 service->WebUILoaded(); |
123 | 131 |
124 #if defined(OS_CHROMEOS) | 132 #if defined(OS_CHROMEOS) |
125 if (app_list::switches::IsVoiceSearchEnabled() && | 133 if (app_list::switches::IsVoiceSearchEnabled() && |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
222 else if (state_string == "NETWORK_ERROR") | 230 else if (state_string == "NETWORK_ERROR") |
223 new_state = SPEECH_RECOGNITION_NETWORK_ERROR; | 231 new_state = SPEECH_RECOGNITION_NETWORK_ERROR; |
224 | 232 |
225 StartPageService* service = | 233 StartPageService* service = |
226 StartPageService::Get(Profile::FromWebUI(web_ui())); | 234 StartPageService::Get(Profile::FromWebUI(web_ui())); |
227 if (service) | 235 if (service) |
228 service->OnSpeechRecognitionStateChanged(new_state); | 236 service->OnSpeechRecognitionStateChanged(new_state); |
229 } | 237 } |
230 | 238 |
231 } // namespace app_list | 239 } // namespace app_list |
OLD | NEW |