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

Side by Side Diff: chrome/browser/ui/webui/ntp/new_tab_page_handler.cc

Issue 12095052: Move app_launcher.* out of chrome/browser/extensions and into apps/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved switches back 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/extensions/app_launcher.h"
12 #include "chrome/browser/prefs/pref_service.h" 12 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/sync/profile_sync_service.h" 14 #include "chrome/browser/sync/profile_sync_service.h"
15 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 15 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
16 #include "chrome/browser/web_resource/notification_promo.h" 16 #include "chrome/browser/web_resource/notification_promo.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "content/public/browser/notification_service.h" 18 #include "content/public/browser/notification_service.h"
19 #include "content/public/browser/web_ui.h" 19 #include "content/public/browser/web_ui.h"
20 #include "grit/chromium_strings.h" 20 #include "grit/chromium_strings.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 "ExtendedNewTabPage.TimeToClickMostVisited", delta); 165 "ExtendedNewTabPage.TimeToClickMostVisited", delta);
166 } else if (histogram_name == "ExtendedNewTabPage.TimeToClickRecentlyClosed") { 166 } else if (histogram_name == "ExtendedNewTabPage.TimeToClickRecentlyClosed") {
167 UMA_HISTOGRAM_LONG_TIMES( 167 UMA_HISTOGRAM_LONG_TIMES(
168 "ExtendedNewTabPage.TimeToClickRecentlyClosed", delta); 168 "ExtendedNewTabPage.TimeToClickRecentlyClosed", delta);
169 } else { 169 } else {
170 NOTREACHED(); 170 NOTREACHED();
171 } 171 }
172 } 172 }
173 173
174 void NewTabPageHandler::HandleGetShouldShowApps(const ListValue* args) { 174 void NewTabPageHandler::HandleGetShouldShowApps(const ListValue* args) {
175 extensions::UpdateIsAppLauncherEnabled( 175 apps::GetIsAppLauncherEnabled(
176 base::Bind(&NewTabPageHandler::GotIsAppLauncherEnabled, 176 base::Bind(&NewTabPageHandler::GotIsAppLauncherEnabled,
177 AsWeakPtr())); 177 AsWeakPtr()));
178 } 178 }
179 179
180 void NewTabPageHandler::GotIsAppLauncherEnabled(bool is_enabled) { 180 void NewTabPageHandler::GotIsAppLauncherEnabled(bool is_enabled) {
181 base::FundamentalValue should_show_apps(!is_enabled); 181 base::FundamentalValue should_show_apps(!is_enabled);
182 web_ui()->CallJavascriptFunction("ntp.gotShouldShowApps", should_show_apps); 182 web_ui()->CallJavascriptFunction("ntp.gotShouldShowApps", should_show_apps);
183 } 183 }
184 184
185 // static 185 // static
(...skipping 20 matching lines...) Expand all
206 values->SetInteger("shown_page_index", shown_page & INDEX_MASK); 206 values->SetInteger("shown_page_index", shown_page & INDEX_MASK);
207 } 207 }
208 208
209 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) { 209 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) {
210 content::NotificationService* service = 210 content::NotificationService* service =
211 content::NotificationService::current(); 211 content::NotificationService::current();
212 service->Notify(notification_type, 212 service->Notify(notification_type,
213 content::Source<NewTabPageHandler>(this), 213 content::Source<NewTabPageHandler>(this),
214 content::NotificationService::NoDetails()); 214 content::NotificationService::NoDetails());
215 } 215 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698