chrome/common/extensions/manifest_handlers/icons_handler.cc - Issue 15239002: Move Extension and PermissionsData to extensions/common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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

« no previous file with comments | « chrome/common/extensions/manifest_handlers/icons_handler.h ('k') | chrome/common/extensions/manifest_handlers/kiosk_mode_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

14 #include "chrome/common/extensions/extension_constants.h"	13 #include "chrome/common/extensions/extension_constants.h"

15 #include "chrome/common/extensions/extension_file_util.h"	14 #include "chrome/common/extensions/extension_file_util.h"

16 #include "chrome/common/extensions/manifest_handler_helpers.h"	15 #include "chrome/common/extensions/manifest_handler_helpers.h"

	16 #include "extensions/common/extension.h"

17 #include "extensions/common/manifest_constants.h"	17 #include "extensions/common/manifest_constants.h"

18 #include "grit/generated_resources.h"	18 #include "grit/generated_resources.h"

19 #include "grit/theme_resources.h"	19 #include "grit/theme_resources.h"

20 #include "third_party/skia/include/core/SkBitmap.h"	20 #include "third_party/skia/include/core/SkBitmap.h"

21 #include "ui/base/resource/resource_bundle.h"	21 #include "ui/base/resource/resource_bundle.h"

22 #include "ui/gfx/size.h"	22 #include "ui/gfx/size.h"

23	23

24 namespace extensions {	24 namespace extensions {

25	25

26 namespace keys = manifest_keys;	26 namespace keys = manifest_keys;

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 extension,	102 extension,

103 IDS_EXTENSION_LOAD_ICON_FAILED,	103 IDS_EXTENSION_LOAD_ICON_FAILED,

104 error);	104 error);

105 }	105 }

106	106

107 const std::vector<std::string> IconsHandler::Keys() const {	107 const std::vector<std::string> IconsHandler::Keys() const {

108 return SingleKey(keys::kIcons);	108 return SingleKey(keys::kIcons);

109 }	109 }

110	110

111 } // namespace extensions	111 } // namespace extensions

OLD	NEW