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 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" | 5 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" |
6 | 6 |
| 7 #include "apps/app_launcher.h" |
7 #include "base/bind.h" | 8 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
10 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
11 #include "base/prefs/pref_service.h" | 12 #include "base/prefs/pref_service.h" |
12 #include "chrome/browser/extensions/app_launcher.h" | |
13 #include "chrome/browser/prefs/pref_registry_syncable.h" | 13 #include "chrome/browser/prefs/pref_registry_syncable.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/sync/profile_sync_service.h" | 15 #include "chrome/browser/sync/profile_sync_service.h" |
16 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 16 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
17 #include "chrome/browser/web_resource/notification_promo.h" | 17 #include "chrome/browser/web_resource/notification_promo.h" |
18 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
19 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" |
20 #include "content/public/browser/web_ui.h" | 20 #include "content/public/browser/web_ui.h" |
21 #include "grit/chromium_strings.h" | 21 #include "grit/chromium_strings.h" |
22 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 "ExtendedNewTabPage.TimeToClickMostVisited", delta); | 166 "ExtendedNewTabPage.TimeToClickMostVisited", delta); |
167 } else if (histogram_name == "ExtendedNewTabPage.TimeToClickRecentlyClosed") { | 167 } else if (histogram_name == "ExtendedNewTabPage.TimeToClickRecentlyClosed") { |
168 UMA_HISTOGRAM_LONG_TIMES( | 168 UMA_HISTOGRAM_LONG_TIMES( |
169 "ExtendedNewTabPage.TimeToClickRecentlyClosed", delta); | 169 "ExtendedNewTabPage.TimeToClickRecentlyClosed", delta); |
170 } else { | 170 } else { |
171 NOTREACHED(); | 171 NOTREACHED(); |
172 } | 172 } |
173 } | 173 } |
174 | 174 |
175 void NewTabPageHandler::HandleGetShouldShowApps(const ListValue* args) { | 175 void NewTabPageHandler::HandleGetShouldShowApps(const ListValue* args) { |
176 extensions::UpdateIsAppLauncherEnabled( | 176 apps::GetIsAppLauncherEnabled( |
177 base::Bind(&NewTabPageHandler::GotIsAppLauncherEnabled, | 177 base::Bind(&NewTabPageHandler::GotIsAppLauncherEnabled, |
178 AsWeakPtr())); | 178 AsWeakPtr())); |
179 } | 179 } |
180 | 180 |
181 void NewTabPageHandler::GotIsAppLauncherEnabled(bool is_enabled) { | 181 void NewTabPageHandler::GotIsAppLauncherEnabled(bool is_enabled) { |
182 base::FundamentalValue should_show_apps(!is_enabled); | 182 base::FundamentalValue should_show_apps(!is_enabled); |
183 web_ui()->CallJavascriptFunction("ntp.gotShouldShowApps", should_show_apps); | 183 web_ui()->CallJavascriptFunction("ntp.gotShouldShowApps", should_show_apps); |
184 } | 184 } |
185 | 185 |
186 // static | 186 // static |
(...skipping 20 matching lines...) Expand all Loading... |
207 values->SetInteger("shown_page_index", shown_page & INDEX_MASK); | 207 values->SetInteger("shown_page_index", shown_page & INDEX_MASK); |
208 } | 208 } |
209 | 209 |
210 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) { | 210 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) { |
211 content::NotificationService* service = | 211 content::NotificationService* service = |
212 content::NotificationService::current(); | 212 content::NotificationService::current(); |
213 service->Notify(notification_type, | 213 service->Notify(notification_type, |
214 content::Source<NewTabPageHandler>(this), | 214 content::Source<NewTabPageHandler>(this), |
215 content::NotificationService::NoDetails()); | 215 content::NotificationService::NoDetails()); |
216 } | 216 } |
OLD | NEW |