| 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/infobar_controller.h" | 5 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/mac/bundle_locations.h" | 8 #include "base/mac/bundle_locations.h" |
| 9 #include "base/mac/mac_util.h" | 9 #include "base/mac/mac_util.h" |
| 10 #include "chrome/browser/infobars/infobar_service.h" | 10 #include "chrome/browser/infobars/infobar_service.h" |
| 11 #import "chrome/browser/ui/cocoa/animatable_view.h" | 11 #import "chrome/browser/ui/cocoa/animatable_view.h" |
| 12 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 12 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 13 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" | 13 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" |
| 14 #import "chrome/browser/ui/cocoa/image_button_cell.h" | 14 #import "chrome/browser/ui/cocoa/image_button_cell.h" |
| 15 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" | 15 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" |
| 16 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h" | 16 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h" |
| 17 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 17 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
| 18 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h" | 18 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h" |
| 19 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 19 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 20 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources.h" |
| 21 #include "grit/ui_resources.h" | |
| 22 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| 22 #include "ui/resources/grit/ui_resources.h" |
| 23 | 23 |
| 24 @interface InfoBarController () | 24 @interface InfoBarController () |
| 25 // Sets |label_| based on |labelPlaceholder_|, sets |labelPlaceholder_| to nil. | 25 // Sets |label_| based on |labelPlaceholder_|, sets |labelPlaceholder_| to nil. |
| 26 - (void)initializeLabel; | 26 - (void)initializeLabel; |
| 27 @end | 27 @end |
| 28 | 28 |
| 29 @implementation InfoBarController | 29 @implementation InfoBarController |
| 30 | 30 |
| 31 @synthesize containerController = containerController_; | 31 @synthesize containerController = containerController_; |
| 32 | 32 |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 [newLabel setAutoresizingMask:[labelPlaceholder_ autoresizingMask]]; | 177 [newLabel setAutoresizingMask:[labelPlaceholder_ autoresizingMask]]; |
| 178 [[labelPlaceholder_ superview] | 178 [[labelPlaceholder_ superview] |
| 179 replaceSubview:labelPlaceholder_ with:newLabel]; | 179 replaceSubview:labelPlaceholder_ with:newLabel]; |
| 180 labelPlaceholder_ = nil; // Now released. | 180 labelPlaceholder_ = nil; // Now released. |
| 181 [newLabel setDelegate:self]; | 181 [newLabel setDelegate:self]; |
| 182 | 182 |
| 183 label_.reset(newLabel.release()); | 183 label_.reset(newLabel.release()); |
| 184 } | 184 } |
| 185 | 185 |
| 186 @end | 186 @end |
| OLD | NEW |