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

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

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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) 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_host.h" 9 #include "chrome/browser/extensions/extension_host.h"
10 #include "chrome/browser/extensions/extension_infobar_delegate.h" 10 #include "chrome/browser/extensions/extension_infobar_delegate.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/ui/browser_finder.h" 13 #include "chrome/browser/ui/browser_finder.h"
14 #import "chrome/browser/ui/cocoa/animatable_view.h" 14 #import "chrome/browser/ui/cocoa/animatable_view.h"
15 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" 15 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
16 #include "chrome/browser/ui/cocoa/infobars/infobar.h" 16 #include "chrome/browser/ui/cocoa/infobars/infobar.h"
17 #import "chrome/browser/ui/cocoa/menu_button.h" 17 #import "chrome/browser/ui/cocoa/menu_button.h"
18 #include "chrome/common/extensions/api/icons/icons_handler.h" 18 #include "chrome/common/extensions/api/icons/icons_handler.h"
19 #include "chrome/common/extensions/extension.h" 19 #include "chrome/common/extensions/extension.h"
20 #include "chrome/common/extensions/extension_constants.h" 20 #include "chrome/common/extensions/extension_constants.h"
21 #include "chrome/common/extensions/extension_icon_set.h" 21 #include "chrome/common/extensions/extension_icon_set.h"
22 #include "chrome/common/extensions/extension_resource.h"
23 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
24 #include "content/public/browser/web_contents_view.h" 23 #include "content/public/browser/web_contents_view.h"
24 #include "extensions/common/extension_resource.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"
30 30
31 namespace { 31 namespace {
32 const CGFloat kAnimationDuration = 0.12; 32 const CGFloat kAnimationDuration = 0.12;
33 const CGFloat kBottomBorderHeightPx = 1.0; 33 const CGFloat kBottomBorderHeightPx = 1.0;
34 const CGFloat kButtonHeightPx = 26.0; 34 const CGFloat kButtonHeightPx = 26.0;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 virtual ~InfobarBridge() { 67 virtual ~InfobarBridge() {
68 if (delegate_) 68 if (delegate_)
69 delegate_->set_observer(NULL); 69 delegate_->set_observer(NULL);
70 } 70 }
71 71
72 // Load the Extension's icon image. 72 // Load the Extension's icon image.
73 void LoadIcon() { 73 void LoadIcon() {
74 const extensions::Extension* extension = delegate_->extension_host()-> 74 const extensions::Extension* extension = delegate_->extension_host()->
75 extension(); 75 extension();
76 ExtensionResource icon_resource = 76 extensions::ExtensionResource icon_resource =
77 extensions::IconsInfo::GetIconResource( 77 extensions::IconsInfo::GetIconResource(
78 extension, 78 extension,
79 extension_misc::EXTENSION_ICON_BITTY, 79 extension_misc::EXTENSION_ICON_BITTY,
80 ExtensionIconSet::MATCH_EXACTLY); 80 ExtensionIconSet::MATCH_EXACTLY);
81 extensions::ImageLoader* loader = 81 extensions::ImageLoader* loader =
82 extensions::ImageLoader::Get(delegate_->extension_host()->profile()); 82 extensions::ImageLoader::Get(delegate_->extension_host()->profile());
83 loader->LoadImageAsync(extension, icon_resource, 83 loader->LoadImageAsync(extension, icon_resource,
84 gfx::Size(extension_misc::EXTENSION_ICON_BITTY, 84 gfx::Size(extension_misc::EXTENSION_ICON_BITTY,
85 extension_misc::EXTENSION_ICON_BITTY), 85 extension_misc::EXTENSION_ICON_BITTY),
86 base::Bind(&InfobarBridge::OnImageLoaded, 86 base::Bind(&InfobarBridge::OnImageLoaded,
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) { 277 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
278 NSWindow* window = 278 NSWindow* window =
279 [(NSView*)owner->GetWebContents()->GetView()->GetContentNativeView() 279 [(NSView*)owner->GetWebContents()->GetView()->GetContentNativeView()
280 window]; 280 window];
281 ExtensionInfoBarController* controller = 281 ExtensionInfoBarController* controller =
282 [[ExtensionInfoBarController alloc] initWithDelegate:this 282 [[ExtensionInfoBarController alloc] initWithDelegate:this
283 owner:owner 283 owner:owner
284 window:window]; 284 window:window];
285 return new InfoBar(controller, this); 285 return new InfoBar(controller, this);
286 } 286 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698