OLD | NEW |
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 22 matching lines...) Expand all Loading... |
33 std::string appId = extension_misc::kInAppPaymentsSupportAppId; | 33 std::string appId = extension_misc::kInAppPaymentsSupportAppId; |
34 prefs_->SetString(appId + ".external_update_url", | 34 prefs_->SetString(appId + ".external_update_url", |
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( |
44 g_browser_process->local_state(), | 44 profile_->GetPrefs(), |
45 IsUserSignedin(profile_), | 45 g_browser_process->local_state(), |
46 kBookmarksExperimentEnabledFromSyncUnknown); | 46 IsUserSignedin(profile_), |
| 47 BOOKMARKS_EXPERIMENT_ENABLED_FROM_SYNC_UNKNOWN); |
47 std::string ext_id; | 48 std::string ext_id; |
48 if (GetBookmarksExperimentExtensionID(profile_->GetPrefs(), &ext_id) && | 49 if (GetBookmarksExperimentExtensionID(profile_->GetPrefs(), &ext_id) && |
49 !ext_id.empty()) { | 50 !ext_id.empty()) { |
50 prefs_->SetString(ext_id + ".external_update_url", | 51 prefs_->SetString(ext_id + ".external_update_url", |
51 extension_urls::GetWebstoreUpdateUrl().spec()); | 52 extension_urls::GetWebstoreUpdateUrl().spec()); |
52 } | 53 } |
53 | 54 |
54 LoadFinished(); | 55 LoadFinished(); |
55 } | 56 } |
56 | 57 |
57 } // namespace extensions | 58 } // namespace extensions |
OLD | NEW |