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

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

Issue 2290753004: Finish changing chrome/ grit includes to use qualified paths. (Closed)
Patch Set: Rebase, fix new unqualified include Created 4 years, 3 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) 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/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 26 matching lines...) Expand all
37 #include "extensions/common/constants.h" 37 #include "extensions/common/constants.h"
38 #include "extensions/common/extension.h" 38 #include "extensions/common/extension.h"
39 #include "extensions/common/extension_l10n_util.h" 39 #include "extensions/common/extension_l10n_util.h"
40 #include "extensions/common/file_util.h" 40 #include "extensions/common/file_util.h"
41 #include "extensions/common/manifest_constants.h" 41 #include "extensions/common/manifest_constants.h"
42 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
43 #include "ui/base/resource/resource_bundle.h" 43 #include "ui/base/resource/resource_bundle.h"
44 44
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 #include "ash/common/system/chromeos/devicetype_utils.h" 46 #include "ash/common/system/chromeos/devicetype_utils.h"
47 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
48 #include "chromeos/chromeos_switches.h"
47 #include "components/chrome_apps/grit/chrome_apps_resources.h" 49 #include "components/chrome_apps/grit/chrome_apps_resources.h"
48 #include "components/user_manager/user_manager.h" 50 #include "components/user_manager/user_manager.h"
49 #include "grit/keyboard_resources.h" 51 #include "content/public/browser/site_instance.h"
52 #include "content/public/browser/storage_partition.h"
53 #include "extensions/browser/extensions_browser_client.h"
54 #include "storage/browser/fileapi/file_system_context.h"
50 #include "ui/file_manager/grit/file_manager_resources.h" 55 #include "ui/file_manager/grit/file_manager_resources.h"
56 #include "ui/keyboard/grit/keyboard_resources.h"
51 #include "ui/keyboard/keyboard_util.h" 57 #include "ui/keyboard/keyboard_util.h"
52 #endif 58 #endif
53 59
54 #if defined(GOOGLE_CHROME_BUILD) 60 #if defined(GOOGLE_CHROME_BUILD)
55 #include "chrome/browser/defaults.h" 61 #include "chrome/browser/defaults.h"
56 #endif 62 #endif
57 63
58 #if defined(OS_CHROMEOS)
59 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
60 #include "chromeos/chromeos_switches.h"
61 #include "content/public/browser/site_instance.h"
62 #include "content/public/browser/storage_partition.h"
63 #include "extensions/browser/extensions_browser_client.h"
64 #include "storage/browser/fileapi/file_system_context.h"
65 #endif
66
67 using content::BrowserThread; 64 using content::BrowserThread;
68 65
69 namespace extensions { 66 namespace extensions {
70 67
71 namespace { 68 namespace {
72 69
73 static bool enable_background_extensions_during_testing = false; 70 static bool enable_background_extensions_during_testing = false;
74 71
75 std::string GenerateId(const base::DictionaryValue* manifest, 72 std::string GenerateId(const base::DictionaryValue* manifest,
76 const base::FilePath& path) { 73 const base::FilePath& path) {
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 manifest.release(), 715 manifest.release(),
719 root_directory, 716 root_directory,
720 false); 717 false);
721 CHECK_EQ(extension_id, actual_extension_id); 718 CHECK_EQ(extension_id, actual_extension_id);
722 if (!done_cb.is_null()) 719 if (!done_cb.is_null())
723 done_cb.Run(); 720 done_cb.Run();
724 } 721 }
725 #endif 722 #endif
726 723
727 } // namespace extensions 724 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/component_extensions_whitelist/whitelist.cc ('k') | chrome/browser/extensions/extension_action.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698