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" | |
12 #include "chrome/browser/infobars/infobar_service.h" | 11 #include "chrome/browser/infobars/infobar_service.h" |
13 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser_finder.h" | 13 #include "chrome/browser/ui/browser_finder.h" |
15 #import "chrome/browser/ui/cocoa/animatable_view.h" | 14 #import "chrome/browser/ui/cocoa/animatable_view.h" |
16 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro
ller.h" | 15 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro
ller.h" |
17 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" | 16 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" |
18 #import "chrome/browser/ui/cocoa/menu_button.h" | 17 #import "chrome/browser/ui/cocoa/menu_button.h" |
19 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
| 19 #include "extensions/browser/image_loader.h" |
20 #include "extensions/common/constants.h" | 20 #include "extensions/common/constants.h" |
21 #include "extensions/common/extension.h" | 21 #include "extensions/common/extension.h" |
22 #include "extensions/common/extension_icon_set.h" | 22 #include "extensions/common/extension_icon_set.h" |
23 #include "extensions/common/extension_resource.h" | 23 #include "extensions/common/extension_resource.h" |
24 #include "extensions/common/manifest_handlers/icons_handler.h" | 24 #include "extensions/common/manifest_handlers/icons_handler.h" |
25 #include "grit/theme_resources.h" | 25 #include "grit/theme_resources.h" |
26 #include "skia/ext/skia_utils_mac.h" | 26 #include "skia/ext/skia_utils_mac.h" |
27 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" |
28 #include "ui/gfx/canvas.h" | 28 #include "ui/gfx/canvas.h" |
29 #include "ui/gfx/image/image.h" | 29 #include "ui/gfx/image/image.h" |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 // static | 261 // static |
262 scoped_ptr<infobars::InfoBar> ExtensionInfoBarDelegate::CreateInfoBar( | 262 scoped_ptr<infobars::InfoBar> ExtensionInfoBarDelegate::CreateInfoBar( |
263 scoped_ptr<ExtensionInfoBarDelegate> delegate) { | 263 scoped_ptr<ExtensionInfoBarDelegate> delegate) { |
264 scoped_ptr<InfoBarCocoa> infobar( | 264 scoped_ptr<InfoBarCocoa> infobar( |
265 new InfoBarCocoa(delegate.PassAs<infobars::InfoBarDelegate>())); | 265 new InfoBarCocoa(delegate.PassAs<infobars::InfoBarDelegate>())); |
266 base::scoped_nsobject<ExtensionInfoBarController> controller( | 266 base::scoped_nsobject<ExtensionInfoBarController> controller( |
267 [[ExtensionInfoBarController alloc] initWithInfoBar:infobar.get()]); | 267 [[ExtensionInfoBarController alloc] initWithInfoBar:infobar.get()]); |
268 infobar->set_controller(controller); | 268 infobar->set_controller(controller); |
269 return infobar.PassAs<infobars::InfoBar>(); | 269 return infobar.PassAs<infobars::InfoBar>(); |
270 } | 270 } |
OLD | NEW |