| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/autofill/autofill_sign_in_container.h" | 5 #import "chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/mac/foundation_util.h" | 9 #include "base/mac/foundation_util.h" |
| 10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 new CocoaSignInDelegate( | 94 new CocoaSignInDelegate( |
| 95 dialog_, | 95 dialog_, |
| 96 webContents_.get(), | 96 webContents_.get(), |
| 97 dialog_->delegate()->GetWebContents(), | 97 dialog_->delegate()->GetWebContents(), |
| 98 gfx::Size(NSSizeToCGSize(initialMinSize)), | 98 gfx::Size(NSSizeToCGSize(initialMinSize)), |
| 99 gfx::Size(NSSizeToCGSize(maxSize_)), | 99 gfx::Size(NSSizeToCGSize(maxSize_)), |
| 100 [self view])); | 100 [self view])); |
| 101 webContents_->GetController().LoadURL( | 101 webContents_->GetController().LoadURL( |
| 102 dialog_->delegate()->SignInUrl(), | 102 dialog_->delegate()->SignInUrl(), |
| 103 content::Referrer(), | 103 content::Referrer(), |
| 104 content::PAGE_TRANSITION_AUTO_TOPLEVEL, | 104 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, |
| 105 std::string()); | 105 std::string()); |
| 106 } | 106 } |
| 107 | 107 |
| 108 - (content::NavigationController*)navigationController { | 108 - (content::NavigationController*)navigationController { |
| 109 return &webContents_->GetController(); | 109 return &webContents_->GetController(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 - (content::WebContents*)webContents { | 112 - (content::WebContents*)webContents { |
| 113 return webContents_.get(); | 113 return webContents_.get(); |
| 114 } | 114 } |
| (...skipping 21 matching lines...) Expand all Loading... |
| 136 preferredSize_ = size; | 136 preferredSize_ = size; |
| 137 preferredSize_.height += chrome_style::kClientBottomPadding; | 137 preferredSize_.height += chrome_style::kClientBottomPadding; |
| 138 | 138 |
| 139 // Always request re-layout if preferredSize changes. | 139 // Always request re-layout if preferredSize changes. |
| 140 id delegate = [[[self view] window] windowController]; | 140 id delegate = [[[self view] window] windowController]; |
| 141 if ([delegate respondsToSelector:@selector(requestRelayout)]) | 141 if ([delegate respondsToSelector:@selector(requestRelayout)]) |
| 142 [delegate performSelector:@selector(requestRelayout)]; | 142 [delegate performSelector:@selector(requestRelayout)]; |
| 143 } | 143 } |
| 144 | 144 |
| 145 @end | 145 @end |
| OLD | NEW |