diff options
| author | matthewyuan <matthewyuan@google.com> | 2015-04-06 14:00:06 -0700 |
|---|---|---|
| committer | matthewyuan <matthewyuan@google.com> | 2015-04-06 21:03:04 +0000 |
| commit | 126d11f4d9b8765eaf2e6e8e3c09f253ff72749d (patch) | |
| tree | 7558bb71a69594e58922880cc2c2147fc04141c3 | |
| parent | 1a62957cd6f6c3f3544e5c6ead5930e735150ff0 (diff) | |
| download | chromium_src-126d11f4d9b8765eaf2e6e8e3c09f253ff72749d.zip chromium_src-126d11f4d9b8765eaf2e6e8e3c09f253ff72749d.tar.gz chromium_src-126d11f4d9b8765eaf2e6e8e3c09f253ff72749d.tar.bz2 | |
Have launcher page instantiation read Now-enabled pref.
BUG=408152
Review URL: https://codereview.chromium.org/946513002
Cr-Commit-Position: refs/heads/master@{#320601}
(cherry picked from commit 563658b3d68b39fc2d5e8109c3e0b5b1b53f6409)
R=skare@chromium.org
Review URL: https://codereview.chromium.org/1060083003
Cr-Commit-Position: refs/branch-heads/2311@{#428}
Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
| -rw-r--r-- | chrome/browser/ui/app_list/app_list_view_delegate.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc index c57ba46..3e9377e 100644 --- a/chrome/browser/ui/app_list/app_list_view_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc @@ -11,6 +11,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/metrics/user_metrics.h" +#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "chrome/browser/apps/scoped_keep_alive.h" @@ -37,6 +38,7 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" +#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/signin/core/browser/signin_manager.h" @@ -135,6 +137,15 @@ void GetCustomLauncherPageUrls(content::BrowserContext* browser_context, } } + // Prevent launcher pages from loading unless the pref is enabled. + // (Command-line specified pages are exempt from this rule). + PrefService* local_state = g_browser_process->local_state(); + if (local_state && + local_state->HasPrefPath(prefs::kGoogleNowLauncherEnabled) && + !local_state->GetBoolean(prefs::kGoogleNowLauncherEnabled)) { + return; + } + // Search the list of installed extensions for ones with 'launcher_page'. extensions::ExtensionRegistry* extension_registry = extensions::ExtensionRegistry::Get(browser_context); |