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

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

Issue 15442002: Move FileAPI sandboxed filesystem related code from webkit/fileapi to webkit/browser/fileapi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/component_loader.h" 5 #include "chrome/browser/extensions/component_loader.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_string_value_serializer.h" 9 #include "base/json/json_string_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 25 matching lines...) Expand all
36 #endif 36 #endif
37 37
38 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
39 #include "chrome/browser/chromeos/login/user_manager.h" 39 #include "chrome/browser/chromeos/login/user_manager.h"
40 #include "chrome/browser/extensions/extension_service.h" 40 #include "chrome/browser/extensions/extension_service.h"
41 #include "chrome/browser/extensions/extension_system.h" 41 #include "chrome/browser/extensions/extension_system.h"
42 #include "chrome/browser/profiles/profile.h" 42 #include "chrome/browser/profiles/profile.h"
43 #include "chrome/browser/profiles/profile_manager.h" 43 #include "chrome/browser/profiles/profile_manager.h"
44 #include "chromeos/chromeos_switches.h" 44 #include "chromeos/chromeos_switches.h"
45 #include "content/public/browser/storage_partition.h" 45 #include "content/public/browser/storage_partition.h"
46 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
46 #include "webkit/fileapi/file_system_context.h" 47 #include "webkit/fileapi/file_system_context.h"
47 #include "webkit/fileapi/sandbox_mount_point_provider.h"
48 #endif 48 #endif
49 49
50 #if defined(ENABLE_APP_LIST) 50 #if defined(ENABLE_APP_LIST)
51 #include "grit/chromium_strings.h" 51 #include "grit/chromium_strings.h"
52 #include "ui/base/l10n/l10n_util.h" 52 #include "ui/base/l10n/l10n_util.h"
53 #endif 53 #endif
54 54
55 namespace extensions { 55 namespace extensions {
56 56
57 namespace { 57 namespace {
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 prefs::kEnterpriseWebStoreURL, 492 prefs::kEnterpriseWebStoreURL,
493 std::string() /* default_value */, 493 std::string() /* default_value */,
494 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 494 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
495 registry->RegisterStringPref( 495 registry->RegisterStringPref(
496 prefs::kEnterpriseWebStoreName, 496 prefs::kEnterpriseWebStoreName,
497 std::string() /* default_value */, 497 std::string() /* default_value */,
498 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 498 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
499 } 499 }
500 500
501 } // namespace extensions 501 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698