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

Side by Side Diff: chrome/browser/extensions/chrome_component_extension_resource_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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/chrome_component_extension_resource_manager. h" 5 #include "chrome/browser/extensions/chrome_component_extension_resource_manager. h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
12 #include "grit/chrome_unscaled_resources.h" 12 #include "chrome/grit/chrome_unscaled_resources.h"
13 #include "grit/component_extension_resources_map.h" 13 #include "chrome/grit/component_extension_resources_map.h"
14 #include "grit/theme_resources.h" 14 #include "chrome/grit/theme_resources.h"
15 15
16 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
17 #include "components/chrome_apps/chrome_apps_resource_util.h" 17 #include "components/chrome_apps/chrome_apps_resource_util.h"
18 #include "ui/file_manager/file_manager_resource_util.h" 18 #include "ui/file_manager/file_manager_resource_util.h"
19 #endif 19 #endif
20 20
21 #if defined(USE_AURA) 21 #if defined(USE_AURA)
22 #include "ui/keyboard/content/keyboard_content_util.h" 22 #include "ui/keyboard/content/keyboard_content_util.h"
23 #endif 23 #endif
24 24
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 entries[i].name); 101 entries[i].name);
102 resource_path = resource_path.NormalizePathSeparators(); 102 resource_path = resource_path.NormalizePathSeparators();
103 103
104 DCHECK(path_to_resource_id_.find(resource_path) == 104 DCHECK(path_to_resource_id_.find(resource_path) ==
105 path_to_resource_id_.end()); 105 path_to_resource_id_.end());
106 path_to_resource_id_[resource_path] = entries[i].value; 106 path_to_resource_id_[resource_path] = entries[i].value;
107 } 107 }
108 } 108 }
109 109
110 } // namespace extensions 110 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/DEPS ('k') | chrome/browser/extensions/component_extensions_whitelist/whitelist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698