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

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

Issue 534013002: Convert chrome_unscaled_resources to use a qualified path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/app/theme/grit/chrome_unscaled_resources.h"
9 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
10 #include "grit/chrome_unscaled_resources.h"
11 #include "grit/component_extension_resources_map.h" 11 #include "grit/component_extension_resources_map.h"
12 #include "grit/theme_resources.h" 12 #include "grit/theme_resources.h"
13 13
14 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
15 #include "ui/file_manager/file_manager_resource_util.h" 15 #include "ui/file_manager/file_manager_resource_util.h"
16 #endif 16 #endif
17 17
18 #if defined(USE_AURA) 18 #if defined(USE_AURA)
19 #include "ui/keyboard/keyboard_util.h" 19 #include "ui/keyboard/keyboard_util.h"
20 #endif 20 #endif
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 entries[i].name); 92 entries[i].name);
93 resource_path = resource_path.NormalizePathSeparators(); 93 resource_path = resource_path.NormalizePathSeparators();
94 94
95 DCHECK(path_to_resource_id_.find(resource_path) == 95 DCHECK(path_to_resource_id_.find(resource_path) ==
96 path_to_resource_id_.end()); 96 path_to_resource_id_.end());
97 path_to_resource_id_[resource_path] = entries[i].value; 97 path_to_resource_id_[resource_path] = entries[i].value;
98 } 98 }
99 } 99 }
100 100
101 } // namespace extensions 101 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/background/background_mode_manager.cc ('k') | chrome/browser/profiles/profile_shortcut_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698