| 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 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 FindBar* BrowserWindowCocoa::CreateFindBar() { | 648 FindBar* BrowserWindowCocoa::CreateFindBar() { |
| 649 // We could push the AddFindBar() call into the FindBarBridge | 649 // We could push the AddFindBar() call into the FindBarBridge |
| 650 // constructor or the FindBarCocoaController init, but that makes | 650 // constructor or the FindBarCocoaController init, but that makes |
| 651 // unit testing difficult, since we would also require a | 651 // unit testing difficult, since we would also require a |
| 652 // BrowserWindow object. | 652 // BrowserWindow object. |
| 653 FindBarBridge* bridge = new FindBarBridge(browser_); | 653 FindBarBridge* bridge = new FindBarBridge(browser_); |
| 654 AddFindBar(bridge->find_bar_cocoa_controller()); | 654 AddFindBar(bridge->find_bar_cocoa_controller()); |
| 655 return bridge; | 655 return bridge; |
| 656 } | 656 } |
| 657 | 657 |
| 658 WebContentsModalDialogHost* | 658 web_modal::WebContentsModalDialogHost* |
| 659 BrowserWindowCocoa::GetWebContentsModalDialogHost() { | 659 BrowserWindowCocoa::GetWebContentsModalDialogHost() { |
| 660 return NULL; | 660 return NULL; |
| 661 } | 661 } |
| 662 | 662 |
| 663 extensions::ActiveTabPermissionGranter* | 663 extensions::ActiveTabPermissionGranter* |
| 664 BrowserWindowCocoa::GetActiveTabPermissionGranter() { | 664 BrowserWindowCocoa::GetActiveTabPermissionGranter() { |
| 665 WebContents* web_contents = | 665 WebContents* web_contents = |
| 666 browser_->tab_strip_model()->GetActiveWebContents(); | 666 browser_->tab_strip_model()->GetActiveWebContents(); |
| 667 if (!web_contents) | 667 if (!web_contents) |
| 668 return NULL; | 668 return NULL; |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 PasswordGenerationBubbleController* controller = | 717 PasswordGenerationBubbleController* controller = |
| 718 [[PasswordGenerationBubbleController alloc] | 718 [[PasswordGenerationBubbleController alloc] |
| 719 initWithWindow:browser_->window()->GetNativeWindow() | 719 initWithWindow:browser_->window()->GetNativeWindow() |
| 720 anchoredAt:point | 720 anchoredAt:point |
| 721 renderViewHost:web_contents->GetRenderViewHost() | 721 renderViewHost:web_contents->GetRenderViewHost() |
| 722 passwordManager:PasswordManager::FromWebContents(web_contents) | 722 passwordManager:PasswordManager::FromWebContents(web_contents) |
| 723 usingGenerator:password_generator | 723 usingGenerator:password_generator |
| 724 forForm:form]; | 724 forForm:form]; |
| 725 [controller showWindow:nil]; | 725 [controller showWindow:nil]; |
| 726 } | 726 } |
| OLD | NEW |