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

Unified 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, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/ntp/new_tab_page_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc
index 8416cfafce3f1f36a5a0bdaf84a68d47568e14ee..c8e802297639ad21b05911e5ddfa96a2f455d4b2 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
+#include "apps/app_launcher.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
-#include "chrome/browser/extensions/app_launcher.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/profile_sync_service.h"
@@ -172,7 +172,7 @@ void NewTabPageHandler::HandleLogTimeToClick(const ListValue* args) {
}
void NewTabPageHandler::HandleGetShouldShowApps(const ListValue* args) {
- extensions::UpdateIsAppLauncherEnabled(
+ apps::GetIsAppLauncherEnabled(
base::Bind(&NewTabPageHandler::GotIsAppLauncherEnabled,
AsWeakPtr()));
}

Powered by Google App Engine
This is Rietveld 408576698