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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/extensions/extension_infobar_controller.h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_infobar_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "app/resource_bundle.h"
10 #include "chrome/browser/extensions/extension_host.h" 9 #include "chrome/browser/extensions/extension_host.h"
11 #include "chrome/browser/extensions/extension_infobar_delegate.h" 10 #include "chrome/browser/extensions/extension_infobar_delegate.h"
12 #include "chrome/browser/tab_contents/tab_contents.h" 11 #include "chrome/browser/tab_contents/tab_contents.h"
13 #import "chrome/browser/ui/cocoa/animatable_view.h" 12 #import "chrome/browser/ui/cocoa/animatable_view.h"
14 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" 13 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
15 #import "chrome/browser/ui/cocoa/menu_button.h" 14 #import "chrome/browser/ui/cocoa/menu_button.h"
16 #include "chrome/browser/ui/cocoa/infobars/infobar.h" 15 #include "chrome/browser/ui/cocoa/infobars/infobar.h"
17 #include "chrome/common/extensions/extension.h" 16 #include "chrome/common/extensions/extension.h"
18 #include "chrome/common/extensions/extension_icon_set.h" 17 #include "chrome/common/extensions/extension_icon_set.h"
19 #include "chrome/common/extensions/extension_resource.h" 18 #include "chrome/common/extensions/extension_resource.h"
20 #include "gfx/canvas_skia.h" 19 #include "gfx/canvas_skia.h"
21 #include "grit/theme_resources.h" 20 #include "grit/theme_resources.h"
22 #include "skia/ext/skia_utils_mac.h" 21 #include "skia/ext/skia_utils_mac.h"
22 #include "ui/base/resource/resource_bundle.h"
23 23
24 namespace { 24 namespace {
25 const CGFloat kAnimationDuration = 0.12; 25 const CGFloat kAnimationDuration = 0.12;
26 const CGFloat kBottomBorderHeightPx = 1.0; 26 const CGFloat kBottomBorderHeightPx = 1.0;
27 const CGFloat kButtonHeightPx = 26.0; 27 const CGFloat kButtonHeightPx = 26.0;
28 const CGFloat kButtonLeftMarginPx = 2.0; 28 const CGFloat kButtonLeftMarginPx = 2.0;
29 const CGFloat kButtonWidthPx = 34.0; 29 const CGFloat kButtonWidthPx = 34.0;
30 const CGFloat kDropArrowLeftMarginPx = 3.0; 30 const CGFloat kDropArrowLeftMarginPx = 3.0;
31 const CGFloat kToolbarMinHeightPx = 36.0; 31 const CGFloat kToolbarMinHeightPx = 36.0;
32 const CGFloat kToolbarMaxHeightPx = 72.0; 32 const CGFloat kToolbarMaxHeightPx = 72.0;
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 258
259 @end 259 @end
260 260
261 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() { 261 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar() {
262 NSWindow* window = [(NSView*)tab_contents_->GetContentNativeView() window]; 262 NSWindow* window = [(NSView*)tab_contents_->GetContentNativeView() window];
263 ExtensionInfoBarController* controller = 263 ExtensionInfoBarController* controller =
264 [[ExtensionInfoBarController alloc] initWithDelegate:this 264 [[ExtensionInfoBarController alloc] initWithDelegate:this
265 window:window]; 265 window:window];
266 return new InfoBar(controller); 266 return new InfoBar(controller);
267 } 267 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698