| OLD | NEW |
| 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 <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "base/logging.h" // for NOTREACHED() | 7 #include "base/logging.h" // for NOTREACHED() |
| 8 #include "base/mac_util.h" | 8 #include "base/mac/mac_util.h" |
| 9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
| 10 #include "chrome/browser/tab_contents/infobar_delegate.h" | 10 #include "chrome/browser/tab_contents/infobar_delegate.h" |
| 11 #import "chrome/browser/ui/cocoa/animatable_view.h" | 11 #import "chrome/browser/ui/cocoa/animatable_view.h" |
| 12 #include "chrome/browser/ui/cocoa/event_utils.h" | 12 #include "chrome/browser/ui/cocoa/event_utils.h" |
| 13 #include "chrome/browser/ui/cocoa/infobar.h" | 13 #include "chrome/browser/ui/cocoa/infobar.h" |
| 14 #import "chrome/browser/ui/cocoa/infobar_container_controller.h" | 14 #import "chrome/browser/ui/cocoa/infobar_container_controller.h" |
| 15 #import "chrome/browser/ui/cocoa/infobar_controller.h" | 15 #import "chrome/browser/ui/cocoa/infobar_controller.h" |
| 16 #include "skia/ext/skia_utils_mac.h" | 16 #include "skia/ext/skia_utils_mac.h" |
| 17 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" | 17 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" |
| 18 #include "webkit/glue/window_open_disposition.h" | 18 #include "webkit/glue/window_open_disposition.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 @end | 94 @end |
| 95 | 95 |
| 96 @implementation InfoBarController | 96 @implementation InfoBarController |
| 97 | 97 |
| 98 @synthesize containerController = containerController_; | 98 @synthesize containerController = containerController_; |
| 99 @synthesize delegate = delegate_; | 99 @synthesize delegate = delegate_; |
| 100 | 100 |
| 101 - (id)initWithDelegate:(InfoBarDelegate*)delegate { | 101 - (id)initWithDelegate:(InfoBarDelegate*)delegate { |
| 102 DCHECK(delegate); | 102 DCHECK(delegate); |
| 103 if ((self = [super initWithNibName:@"InfoBar" | 103 if ((self = [super initWithNibName:@"InfoBar" |
| 104 bundle:mac_util::MainAppBundle()])) { | 104 bundle:base::mac::MainAppBundle()])) { |
| 105 delegate_ = delegate; | 105 delegate_ = delegate; |
| 106 } | 106 } |
| 107 return self; | 107 return self; |
| 108 } | 108 } |
| 109 | 109 |
| 110 // All infobars have an icon, so we set up the icon in the base class | 110 // All infobars have an icon, so we set up the icon in the base class |
| 111 // awakeFromNib. | 111 // awakeFromNib. |
| 112 - (void)awakeFromNib { | 112 - (void)awakeFromNib { |
| 113 DCHECK(delegate_); | 113 DCHECK(delegate_); |
| 114 if (delegate_->GetIcon()) { | 114 if (delegate_->GetIcon()) { |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 LinkInfoBarController* controller = | 524 LinkInfoBarController* controller = |
| 525 [[LinkInfoBarController alloc] initWithDelegate:this]; | 525 [[LinkInfoBarController alloc] initWithDelegate:this]; |
| 526 return new InfoBar(controller); | 526 return new InfoBar(controller); |
| 527 } | 527 } |
| 528 | 528 |
| 529 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() { | 529 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() { |
| 530 ConfirmInfoBarController* controller = | 530 ConfirmInfoBarController* controller = |
| 531 [[ConfirmInfoBarController alloc] initWithDelegate:this]; | 531 [[ConfirmInfoBarController alloc] initWithDelegate:this]; |
| 532 return new InfoBar(controller); | 532 return new InfoBar(controller); |
| 533 } | 533 } |
| OLD | NEW |