diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 06:15:10 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 06:15:10 +0000 |
| commit | dc63aab9a03d091b4c88a0967d19f52a61212e16 (patch) | |
| tree | 41ddfc74523057a226abca2ddfd52e83a00e75ae /chrome/browser/ui/webui/ntp/new_tab_page_handler.cc | |
| parent | b1c20f53f919d5d14694562b659d0957fcd30997 (diff) | |
| download | chromium_src-dc63aab9a03d091b4c88a0967d19f52a61212e16.zip chromium_src-dc63aab9a03d091b4c88a0967d19f52a61212e16.tar.gz chromium_src-dc63aab9a03d091b4c88a0967d19f52a61212e16.tar.bz2 | |
Move app_launcher.* out of chrome/browser/extensions and into apps/
This change also moves some UI code from chrome/browser/extensions into
/chrome/browser/ui/, and cleans up the app_launcher.* code.
BUG=159366
Review URL: https://chromiumcodereview.appspot.com/12095052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/ntp/new_tab_page_handler.cc')
| -rw-r--r-- | chrome/browser/ui/webui/ntp/new_tab_page_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 31f18cb..78973b6 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc @@ -4,12 +4,12 @@ #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 "base/prefs/pref_service.h" -#include "chrome/browser/extensions/app_launcher.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -173,7 +173,7 @@ void NewTabPageHandler::HandleLogTimeToClick(const ListValue* args) { } void NewTabPageHandler::HandleGetShouldShowApps(const ListValue* args) { - extensions::UpdateIsAppLauncherEnabled( + apps::GetIsAppLauncherEnabled( base::Bind(&NewTabPageHandler::GotIsAppLauncherEnabled, AsWeakPtr())); } |