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

Side by Side Diff: extensions/common/manifest_handlers/icons_handler.cc

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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
« no previous file with comments | « extensions/common/extension.h ('k') | gpu/command_buffer/client/gl_in_process_context.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "extensions/common/manifest_handlers/icons_handler.h" 5 #include "extensions/common/manifest_handlers/icons_handler.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "extensions/common/constants.h" 13 #include "extensions/common/constants.h"
14 #include "extensions/common/extension.h" 14 #include "extensions/common/extension.h"
15 #include "extensions/common/file_util.h" 15 #include "extensions/common/file_util.h"
16 #include "extensions/common/manifest_constants.h" 16 #include "extensions/common/manifest_constants.h"
17 #include "extensions/common/manifest_handler_helpers.h" 17 #include "extensions/common/manifest_handler_helpers.h"
18 #include "grit/extensions_strings.h" 18 #include "grit/extensions_strings.h"
19 #include "ui/gfx/size.h" 19 #include "ui/gfx/geometry/size.h"
20 20
21 namespace extensions { 21 namespace extensions {
22 22
23 namespace keys = manifest_keys; 23 namespace keys = manifest_keys;
24 24
25 static base::LazyInstance<ExtensionIconSet> g_empty_icon_set = 25 static base::LazyInstance<ExtensionIconSet> g_empty_icon_set =
26 LAZY_INSTANCE_INITIALIZER; 26 LAZY_INSTANCE_INITIALIZER;
27 27
28 // static 28 // static
29 const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) { 29 const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 extension, 83 extension,
84 IDS_EXTENSION_LOAD_ICON_FAILED, 84 IDS_EXTENSION_LOAD_ICON_FAILED,
85 error); 85 error);
86 } 86 }
87 87
88 const std::vector<std::string> IconsHandler::Keys() const { 88 const std::vector<std::string> IconsHandler::Keys() const {
89 return SingleKey(keys::kIcons); 89 return SingleKey(keys::kIcons);
90 } 90 }
91 91
92 } // namespace extensions 92 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/extension.h ('k') | gpu/command_buffer/client/gl_in_process_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698