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

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/json/json_string_value_serializer.h" 11 #include "base/json/json_string_value_serializer.h"
12 #include "base/metrics/field_trial.h" 12 #include "base/metrics/field_trial.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/search/hotword_service_factory.h" 15 #include "chrome/browser/search/hotword_service_factory.h"
16 #include "chrome/common/chrome_paths.h" 16 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/chrome_version_info.h" 18 #include "chrome/common/chrome_version_info.h"
19 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
20 #include "chrome/grit/generated_resources.h"
20 #include "components/crx_file/id_util.h" 21 #include "components/crx_file/id_util.h"
21 #include "content/public/browser/browser_context.h" 22 #include "content/public/browser/browser_context.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/plugin_service.h" 24 #include "content/public/browser/plugin_service.h"
24 #include "extensions/common/extension.h" 25 #include "extensions/common/extension.h"
25 #include "extensions/common/file_util.h" 26 #include "extensions/common/file_util.h"
26 #include "extensions/common/manifest_constants.h" 27 #include "extensions/common/manifest_constants.h"
27 #include "grit/browser_resources.h" 28 #include "grit/browser_resources.h"
28 #include "grit/generated_resources.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
31 31
32 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
33 #include "grit/keyboard_resources.h" 33 #include "grit/keyboard_resources.h"
34 #include "ui/file_manager/grit/file_manager_resources.h" 34 #include "ui/file_manager/grit/file_manager_resources.h"
35 #include "ui/keyboard/keyboard_util.h" 35 #include "ui/keyboard/keyboard_util.h"
36 #endif 36 #endif
37 37
38 #if defined(GOOGLE_CHROME_BUILD) 38 #if defined(GOOGLE_CHROME_BUILD)
39 #include "chrome/browser/defaults.h" 39 #include "chrome/browser/defaults.h"
40 #endif 40 #endif
41 41
42 #if defined(OS_CHROMEOS) 42 #if defined(OS_CHROMEOS)
43 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 43 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
44 #include "chromeos/chromeos_switches.h" 44 #include "chromeos/chromeos_switches.h"
45 #include "content/public/browser/site_instance.h" 45 #include "content/public/browser/site_instance.h"
46 #include "content/public/browser/storage_partition.h" 46 #include "content/public/browser/storage_partition.h"
47 #include "extensions/browser/extensions_browser_client.h" 47 #include "extensions/browser/extensions_browser_client.h"
48 #include "webkit/browser/fileapi/file_system_context.h" 48 #include "webkit/browser/fileapi/file_system_context.h"
49 #endif 49 #endif
50 50
51 #if defined(ENABLE_APP_LIST) 51 #if defined(ENABLE_APP_LIST)
52 #include "grit/chromium_strings.h" 52 #include "chrome/grit/chromium_strings.h"
53 #endif 53 #endif
54 54
55 using content::BrowserThread; 55 using content::BrowserThread;
56 56
57 namespace extensions { 57 namespace extensions {
58 58
59 namespace { 59 namespace {
60 60
61 static bool enable_background_extensions_during_testing = false; 61 static bool enable_background_extensions_during_testing = false;
62 62
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 off_the_record_context, Extension::GetBaseURLFromExtensionId(id)); 633 off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
634 fileapi::FileSystemContext* file_system_context = 634 fileapi::FileSystemContext* file_system_context =
635 content::BrowserContext::GetStoragePartitionForSite( 635 content::BrowserContext::GetStoragePartitionForSite(
636 off_the_record_context, site)->GetFileSystemContext(); 636 off_the_record_context, site)->GetFileSystemContext();
637 file_system_context->EnableTemporaryFileSystemInIncognito(); 637 file_system_context->EnableTemporaryFileSystemInIncognito();
638 } 638 }
639 #endif 639 #endif
640 } 640 }
641 641
642 } // namespace extensions 642 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/bundle_installer.cc ('k') | chrome/browser/extensions/crx_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698