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

Side by Side Diff: chrome/browser/extensions/external_component_loader.cc

Issue 291153012: Consolidated enhanced bookmarks experiment logic in one place. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/external_component_loader.h" 5 #include "chrome/browser/extensions/external_component_loader.h"
6 6
7 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" 7 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/search/hotword_service_factory.h" 9 #include "chrome/browser/search/hotword_service_factory.h"
10 #include "chrome/browser/signin/signin_manager_factory.h" 10 #include "chrome/browser/signin/signin_manager_factory.h"
(...skipping 24 matching lines...) Expand all
35 extension_urls::GetWebstoreUpdateUrl().spec()); 35 extension_urls::GetWebstoreUpdateUrl().spec());
36 36
37 if (HotwordServiceFactory::IsHotwordAllowed(profile_)) { 37 if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
38 std::string hotwordId = extension_misc::kHotwordExtensionId; 38 std::string hotwordId = extension_misc::kHotwordExtensionId;
39 prefs_->SetString(hotwordId + ".external_update_url", 39 prefs_->SetString(hotwordId + ".external_update_url",
40 extension_urls::GetWebstoreUpdateUrl().spec()); 40 extension_urls::GetWebstoreUpdateUrl().spec());
41 } 41 }
42 42
43 UpdateBookmarksExperimentState(profile_->GetPrefs(), 43 UpdateBookmarksExperimentState(profile_->GetPrefs(),
44 g_browser_process->local_state(), 44 g_browser_process->local_state(),
45 IsUserSignedin(profile_)); 45 IsUserSignedin(profile_),
46 kBookmarksExperimentEnabledFromSyncUnknown);
46 std::string ext_id; 47 std::string ext_id;
47 if (GetBookmarksExperimentExtensionID(profile_->GetPrefs(), &ext_id) && 48 if (GetBookmarksExperimentExtensionID(profile_->GetPrefs(), &ext_id) &&
48 !ext_id.empty()) { 49 !ext_id.empty()) {
49 prefs_->SetString(ext_id + ".external_update_url", 50 prefs_->SetString(ext_id + ".external_update_url",
50 extension_urls::GetWebstoreUpdateUrl().spec()); 51 extension_urls::GetWebstoreUpdateUrl().spec());
51 } 52 }
52 53
53 LoadFinished(); 54 LoadFinished();
54 } 55 }
55 56
56 } // namespace extensions 57 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698