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

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

Issue 22794012: Rename extension_manifest_keys namespace to extensions::manifest_keys. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/common/extensions/manifest_handlers/icons_handler.h" 5 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
6 6
7 #include "base/file_util.h" 7 #include "base/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 "chrome/common/extensions/extension.h" 13 #include "chrome/common/extensions/extension.h"
14 #include "chrome/common/extensions/extension_file_util.h" 14 #include "chrome/common/extensions/extension_file_util.h"
15 #include "chrome/common/extensions/extension_manifest_constants.h" 15 #include "chrome/common/extensions/extension_manifest_constants.h"
16 #include "chrome/common/extensions/manifest_handler_helpers.h" 16 #include "chrome/common/extensions/manifest_handler_helpers.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "third_party/skia/include/core/SkBitmap.h" 19 #include "third_party/skia/include/core/SkBitmap.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/gfx/size.h" 21 #include "ui/gfx/size.h"
22 22
23 namespace keys = extension_manifest_keys; 23 namespace extensions {
24 24
25 namespace extensions { 25 namespace keys = manifest_keys;
26 26
27 static base::LazyInstance<ExtensionIconSet> g_empty_icon_set = 27 static base::LazyInstance<ExtensionIconSet> g_empty_icon_set =
28 LAZY_INSTANCE_INITIALIZER; 28 LAZY_INSTANCE_INITIALIZER;
29 29
30 const int IconsInfo::kPageActionIconMaxSize = 19; 30 const int IconsInfo::kPageActionIconMaxSize = 19;
31 const int IconsInfo::kBrowserActionIconMaxSize = 19; 31 const int IconsInfo::kBrowserActionIconMaxSize = 19;
32 32
33 // static 33 // static
34 const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) { 34 const ExtensionIconSet& IconsInfo::GetIcons(const Extension* extension) {
35 IconsInfo* info = static_cast<IconsInfo*>( 35 IconsInfo* info = static_cast<IconsInfo*>(
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 extension, 101 extension,
102 IDS_EXTENSION_LOAD_ICON_FAILED, 102 IDS_EXTENSION_LOAD_ICON_FAILED,
103 error); 103 error);
104 } 104 }
105 105
106 const std::vector<std::string> IconsHandler::Keys() const { 106 const std::vector<std::string> IconsHandler::Keys() const {
107 return SingleKey(keys::kIcons); 107 return SingleKey(keys::kIcons);
108 } 108 }
109 109
110 } // namespace extensions 110 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698