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

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

Issue 225043002: Move extension_icon_set.{h,cc} to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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
« no previous file with comments | « chrome/browser/extensions/extension_web_ui.cc ('k') | chrome/browser/extensions/tab_helper.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/image_loader.h" 5 #include "chrome/browser/extensions/image_loader.h"
6 6
7 #include "base/json/json_file_value_serializer.h" 7 #include "base/json/json_file_value_serializer.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
12 #include "chrome/common/extensions/extension_icon_set.h"
13 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" 12 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
14 #include "content/public/browser/notification_service.h" 13 #include "content/public/browser/notification_service.h"
15 #include "content/public/test/test_browser_thread.h" 14 #include "content/public/test/test_browser_thread.h"
16 #include "extensions/common/constants.h" 15 #include "extensions/common/constants.h"
17 #include "extensions/common/extension.h" 16 #include "extensions/common/extension.h"
17 #include "extensions/common/extension_icon_set.h"
18 #include "extensions/common/extension_resource.h" 18 #include "extensions/common/extension_resource.h"
19 #include "extensions/common/manifest.h" 19 #include "extensions/common/manifest.h"
20 #include "grit/component_extension_resources.h" 20 #include "grit/component_extension_resources.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "ui/gfx/image/image.h" 23 #include "ui/gfx/image/image.h"
24 #include "ui/gfx/image/image_family.h" 24 #include "ui/gfx/image/image_family.h"
25 #include "ui/gfx/image/image_skia.h" 25 #include "ui/gfx/image/image_skia.h"
26 #include "ui/gfx/size.h" 26 #include "ui/gfx/size.h"
27 27
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 328
329 #if defined(OS_CHROMEOS) 329 #if defined(OS_CHROMEOS)
330 int resource_id; 330 int resource_id;
331 ASSERT_EQ(true, 331 ASSERT_EQ(true,
332 ImageLoader::IsComponentExtensionResource(extension->path(), 332 ImageLoader::IsComponentExtensionResource(extension->path(),
333 resource.relative_path(), 333 resource.relative_path(),
334 &resource_id)); 334 &resource_id));
335 ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id); 335 ASSERT_EQ(IDR_FILE_MANAGER_ICON_16, resource_id);
336 #endif 336 #endif
337 } 337 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_web_ui.cc ('k') | chrome/browser/extensions/tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698