chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm - Issue 229813002: Move extensions manifest IconsHandler to //extensions

Side by Side Diff: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

Issue 229813002: Move extensions manifest IconsHandler to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (icons-handler) 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/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm » ('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) 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 #import "chrome/browser/ui/cocoa/infobars/extension_infobar_controller.h"	5 #import "chrome/browser/ui/cocoa/infobars/extension_infobar_controller.h"

6	6

7 #include <cmath>	7 #include <cmath>

8	8

9 #include "chrome/browser/extensions/extension_infobar_delegate.h"	9 #include "chrome/browser/extensions/extension_infobar_delegate.h"

10 #include "chrome/browser/extensions/extension_view_host.h"	10 #include "chrome/browser/extensions/extension_view_host.h"

11 #include "chrome/browser/extensions/image_loader.h"	11 #include "chrome/browser/extensions/image_loader.h"

12 #include "chrome/browser/infobars/infobar_service.h"	12 #include "chrome/browser/infobars/infobar_service.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/browser_finder.h"	14 #include "chrome/browser/ui/browser_finder.h"

15 #import "chrome/browser/ui/cocoa/animatable_view.h"	15 #import "chrome/browser/ui/cocoa/animatable_view.h"

16 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro ller.h"	16 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro ller.h"

17 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"	17 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"

18 #import "chrome/browser/ui/cocoa/menu_button.h"	18 #import "chrome/browser/ui/cocoa/menu_button.h"

19 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"

20 #include "content/public/browser/web_contents.h"	19 #include "content/public/browser/web_contents.h"

21 #include "content/public/browser/web_contents_view.h"	20 #include "content/public/browser/web_contents_view.h"

22 #include "extensions/common/constants.h"	21 #include "extensions/common/constants.h"

23 #include "extensions/common/extension.h"	22 #include "extensions/common/extension.h"

24 #include "extensions/common/extension_icon_set.h"	23 #include "extensions/common/extension_icon_set.h"

25 #include "extensions/common/extension_resource.h"	24 #include "extensions/common/extension_resource.h"

	25 #include "extensions/common/manifest_handlers/icons_handler.h"

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

27 #include "skia/ext/skia_utils_mac.h"	27 #include "skia/ext/skia_utils_mac.h"

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

29 #include "ui/gfx/canvas.h"	29 #include "ui/gfx/canvas.h"

30 #include "ui/gfx/image/image.h"	30 #include "ui/gfx/image/image.h"

31	31

32 const CGFloat kBottomBorderHeightPx = 1.0;	32 const CGFloat kBottomBorderHeightPx = 1.0;

33 const CGFloat kButtonHeightPx = 26.0;	33 const CGFloat kButtonHeightPx = 26.0;

34 const CGFloat kButtonLeftMarginPx = 2.0;	34 const CGFloat kButtonLeftMarginPx = 2.0;

35 const CGFloat kButtonWidthPx = 34.0;	35 const CGFloat kButtonWidthPx = 34.0;

(...skipping 226 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
262 // static	262 // static

263 scoped_ptr<InfoBar> ExtensionInfoBarDelegate::CreateInfoBar(	263 scoped_ptr<InfoBar> ExtensionInfoBarDelegate::CreateInfoBar(

264 scoped_ptr<ExtensionInfoBarDelegate> delegate) {	264 scoped_ptr<ExtensionInfoBarDelegate> delegate) {

265 scoped_ptr<InfoBarCocoa> infobar(	265 scoped_ptr<InfoBarCocoa> infobar(

266 new InfoBarCocoa(delegate.PassAs<InfoBarDelegate>()));	266 new InfoBarCocoa(delegate.PassAs<InfoBarDelegate>()));

267 base::scoped_nsobject<ExtensionInfoBarController> controller(	267 base::scoped_nsobject<ExtensionInfoBarController> controller(

268 [[ExtensionInfoBarController alloc] initWithInfoBar:infobar.get()]);	268 [[ExtensionInfoBarController alloc] initWithInfoBar:infobar.get()]);

269 infobar->set_controller(controller);	269 infobar->set_controller(controller);

270 return infobar.PassAs<InfoBar>();	270 return infobar.PassAs<InfoBar>();

271 }	271 }

OLD	NEW