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 "base/sha1.h" | 7 #include "base/sha1.h" |
8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 9 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 if (GetBookmarksExperimentExtensionID(profile_->GetPrefs(), | 68 if (GetBookmarksExperimentExtensionID(profile_->GetPrefs(), |
69 &extension_id) && | 69 &extension_id) && |
70 !extension_id.empty()) { | 70 !extension_id.empty()) { |
71 prefs_->SetString(extension_id + ".external_update_url", | 71 prefs_->SetString(extension_id + ".external_update_url", |
72 extension_urls::GetWebstoreUpdateUrl().spec()); | 72 extension_urls::GetWebstoreUpdateUrl().spec()); |
73 } | 73 } |
74 } | 74 } |
75 | 75 |
76 #if defined(OS_CHROMEOS) | 76 #if defined(OS_CHROMEOS) |
77 { | 77 { |
78 CommandLine* const command_line = CommandLine::ForCurrentProcess(); | 78 base::CommandLine* const command_line = |
| 79 base::CommandLine::ForCurrentProcess(); |
79 if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker)) { | 80 if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker)) { |
80 const std::string extension_id = extension_misc::kZIPUnpackerExtensionId; | 81 const std::string extension_id = extension_misc::kZIPUnpackerExtensionId; |
81 prefs_->SetString(extension_id + ".external_update_url", | 82 prefs_->SetString(extension_id + ".external_update_url", |
82 extension_urls::GetWebstoreUpdateUrl().spec()); | 83 extension_urls::GetWebstoreUpdateUrl().spec()); |
83 } | 84 } |
84 } | 85 } |
85 #endif | 86 #endif |
86 | 87 |
87 LoadFinished(); | 88 LoadFinished(); |
88 } | 89 } |
89 | 90 |
90 } // namespace extensions | 91 } // namespace extensions |
OLD | NEW |