summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history
diff options
context:
space:
mode:
authornshkrob@chromium.org <nshkrob@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-26 20:43:32 +0000
committernshkrob@chromium.org <nshkrob@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-26 20:43:32 +0000
commitb9cae1c54cf648666a431b36c6aae19787ec6913 (patch)
treef061f1fad01d4f74d3cc645cdc4942fd6ec9885a /chrome/browser/history
parentbd4277807a689b8880e769ddc036b1029d3e000f (diff)
downloadchromium_src-b9cae1c54cf648666a431b36c6aae19787ec6913.zip
chromium_src-b9cae1c54cf648666a431b36c6aae19787ec6913.tar.gz
chromium_src-b9cae1c54cf648666a431b36c6aae19787ec6913.tar.bz2
Only add Chrome App Store if the apps flag is on.
See also http://codereview.chromium.org/3048020 BUG=49972 TEST=Manually Review URL: http://codereview.chromium.org/3007012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history')
-rw-r--r--chrome/browser/history/top_sites.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 950bb2f..a568e2b 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include "app/l10n_util.h"
+#include "base/command_line.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/md5.h"
@@ -24,6 +25,7 @@
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/thumbnail_score.h"
#include "gfx/codec/jpeg_codec.h"
@@ -285,6 +287,9 @@ int TopSites::GetIndexForChromeStore(const MostVisitedURLList& urls) {
}
bool TopSites::AddChromeStore(MostVisitedURLList* urls) {
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps))
+ return false;
+
ExtensionsService* service = profile_->GetExtensionsService();
if (!service || service->HasApps())
return false;