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_ui.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_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/ntp/new_tab_ui.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 0808c47..968be06 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -8,6 +8,7 @@ #include <set> +#include "apps/app_launcher.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" @@ -20,7 +21,6 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.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/sessions/session_types.h" @@ -300,7 +300,9 @@ bool NewTabUI::ShouldShowApps() { // Android does not have apps. return false; #else - return !extensions::IsAppLauncherEnabled(); + // This needs to be synchronous, so we use the value the last time it + // was checked. + return !apps::WasAppLauncherEnabled(); #endif } |