| 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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 browser_->tab_strip_model()->GetActiveWebContents(); | 665 browser_->tab_strip_model()->GetActiveWebContents(); |
| 666 if (!web_contents) | 666 if (!web_contents) |
| 667 return NULL; | 667 return NULL; |
| 668 extensions::TabHelper* tab_helper = | 668 extensions::TabHelper* tab_helper = |
| 669 extensions::TabHelper::FromWebContents(web_contents); | 669 extensions::TabHelper::FromWebContents(web_contents); |
| 670 return tab_helper ? tab_helper->active_tab_permission_granter() : NULL; | 670 return tab_helper ? tab_helper->active_tab_permission_granter() : NULL; |
| 671 } | 671 } |
| 672 | 672 |
| 673 void BrowserWindowCocoa::ModelChanged(const SearchModel::State& old_state, | 673 void BrowserWindowCocoa::ModelChanged(const SearchModel::State& old_state, |
| 674 const SearchModel::State& new_state) { | 674 const SearchModel::State& new_state) { |
| 675 [controller_ updateBookmarkBarStateForInstantOverlay]; | |
| 676 } | 675 } |
| 677 | 676 |
| 678 void BrowserWindowCocoa::DestroyBrowser() { | 677 void BrowserWindowCocoa::DestroyBrowser() { |
| 679 [controller_ destroyBrowser]; | 678 [controller_ destroyBrowser]; |
| 680 | 679 |
| 681 // at this point the controller is dead (autoreleased), so | 680 // at this point the controller is dead (autoreleased), so |
| 682 // make sure we don't try to reference it any more. | 681 // make sure we don't try to reference it any more. |
| 683 } | 682 } |
| 684 | 683 |
| 685 NSWindow* BrowserWindowCocoa::window() const { | 684 NSWindow* BrowserWindowCocoa::window() const { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 PasswordGenerationBubbleController* controller = | 716 PasswordGenerationBubbleController* controller = |
| 718 [[PasswordGenerationBubbleController alloc] | 717 [[PasswordGenerationBubbleController alloc] |
| 719 initWithWindow:browser_->window()->GetNativeWindow() | 718 initWithWindow:browser_->window()->GetNativeWindow() |
| 720 anchoredAt:point | 719 anchoredAt:point |
| 721 renderViewHost:web_contents->GetRenderViewHost() | 720 renderViewHost:web_contents->GetRenderViewHost() |
| 722 passwordManager:PasswordManager::FromWebContents(web_contents) | 721 passwordManager:PasswordManager::FromWebContents(web_contents) |
| 723 usingGenerator:password_generator | 722 usingGenerator:password_generator |
| 724 forForm:form]; | 723 forForm:form]; |
| 725 [controller showWindow:nil]; | 724 [controller showWindow:nil]; |
| 726 } | 725 } |
| OLD | NEW |