Chromium Code Reviews| Index: chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm |
| diff --git a/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm b/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm |
| index 50a20aac825e71c135ab527dbcffca2214922fe8..2778aa175a21e3b111d635bee7978d9b07a95ef7 100644 |
| --- a/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm |
| +++ b/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.mm |
| @@ -9,7 +9,6 @@ |
| #include "chrome/browser/ui/browser_window.h" |
| #include "chrome/browser/ui/cocoa/accelerators_cocoa.h" |
| #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| -#import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h" |
|
tapted
2016/05/25 03:53:27
Delete exclusive_access_bubble_window_controller.h
Matt Giuca
2016/05/26 04:15:40
Acknowledged.
|
| #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
| #include "chrome/browser/ui/status_bubble.h" |
| #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
| @@ -34,26 +33,12 @@ ExclusiveAccessController::ExclusiveAccessController( |
| ExclusiveAccessController::~ExclusiveAccessController() {} |
| void ExclusiveAccessController::Show() { |
| - if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) { |
| - views_bubble_.reset( |
| - new ExclusiveAccessBubbleViews(this, url_, bubble_type_)); |
| - return; |
| - } |
| - |
| - [cocoa_bubble_ closeImmediately]; |
| - cocoa_bubble_.reset([[ExclusiveAccessBubbleWindowController alloc] |
| - initWithOwner:controller_ |
| - exclusive_access_manager:browser_->exclusive_access_manager() |
| - profile:browser_->profile() |
| - url:url_ |
| - bubbleType:bubble_type_]); |
| - [cocoa_bubble_ showWindow]; |
| + views_bubble_.reset(new ExclusiveAccessBubbleViews(this, url_, bubble_type_)); |
| + return; |
|
scheib
2016/05/24 19:43:47
return; not needed.
Matt Giuca
2016/05/26 04:15:40
Done.
|
| } |
| void ExclusiveAccessController::Destroy() { |
| views_bubble_.reset(); |
| - [cocoa_bubble_ closeImmediately]; |
| - cocoa_bubble_.reset(); |
| url_ = GURL(); |
| bubble_type_ = EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; |
| } |
| @@ -61,7 +46,6 @@ void ExclusiveAccessController::Destroy() { |
| void ExclusiveAccessController::Layout(CGFloat max_y) { |
| if (views_bubble_) |
| views_bubble_->RepositionIfVisible(); |
| - [cocoa_bubble_ positionInWindowAtTop:max_y]; |
| } |
| Profile* ExclusiveAccessController::GetProfile() { |