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

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

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/extension_assets_manager_chromeos.h" 5 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
6 6
7 #include <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 DCHECK_CURRENTLY_ON(BrowserThread::UI); 246 DCHECK_CURRENTLY_ON(BrowserThread::UI);
247 ExtensionService* extension_service = 247 ExtensionService* extension_service =
248 ExtensionSystem::Get(profile)->extension_service(); 248 ExtensionSystem::Get(profile)->extension_service();
249 return extension_service->GetFileTaskRunner(); 249 return extension_service->GetFileTaskRunner();
250 } 250 }
251 251
252 // static 252 // static
253 bool ExtensionAssetsManagerChromeOS::CanShareAssets( 253 bool ExtensionAssetsManagerChromeOS::CanShareAssets(
254 const Extension* extension, 254 const Extension* extension,
255 const base::FilePath& unpacked_extension_root) { 255 const base::FilePath& unpacked_extension_root) {
256 if (!CommandLine::ForCurrentProcess()->HasSwitch( 256 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
257 chromeos::switches::kEnableExtensionAssetsSharing)) { 257 chromeos::switches::kEnableExtensionAssetsSharing)) {
258 return false; 258 return false;
259 } 259 }
260 260
261 GURL update_url = ManifestURL::GetUpdateURL(extension); 261 GURL update_url = ManifestURL::GetUpdateURL(extension);
262 if (!update_url.is_empty() && 262 if (!update_url.is_empty() &&
263 !extension_urls::IsWebstoreUpdateUrl(update_url)) { 263 !extension_urls::IsWebstoreUpdateUrl(update_url)) {
264 return false; 264 return false;
265 } 265 }
266 266
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 std::make_pair(id, base::FilePath(shared_path))); 566 std::make_pair(id, base::FilePath(shared_path)));
567 } else { 567 } else {
568 extension_info->RemoveWithoutPathExpansion(*it, NULL); 568 extension_info->RemoveWithoutPathExpansion(*it, NULL);
569 } 569 }
570 } 570 }
571 571
572 return true; 572 return true;
573 } 573 }
574 574
575 } // namespace extensions 575 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_apitest.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698