| 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 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 // BrowserWindow object. | 607 // BrowserWindow object. |
| 608 FindBarBridge* bridge = new FindBarBridge(); | 608 FindBarBridge* bridge = new FindBarBridge(); |
| 609 AddFindBar(bridge->find_bar_cocoa_controller()); | 609 AddFindBar(bridge->find_bar_cocoa_controller()); |
| 610 return bridge; | 610 return bridge; |
| 611 } | 611 } |
| 612 | 612 |
| 613 bool BrowserWindowCocoa::GetConstrainedWindowTopY(int* top_y) { | 613 bool BrowserWindowCocoa::GetConstrainedWindowTopY(int* top_y) { |
| 614 return false; | 614 return false; |
| 615 } | 615 } |
| 616 | 616 |
| 617 void BrowserWindowCocoa::Observe(int type, | 617 void BrowserWindowCocoa::OnPreferenceChanged(PrefServiceBase* service, |
| 618 const content::NotificationSource& source, | 618 const std::string& pref_name) { |
| 619 const content::NotificationDetails& details) { | 619 DCHECK(pref_name == prefs::kShowBookmarkBar); |
| 620 switch (type) { | 620 [controller_ updateBookmarkBarVisibilityWithAnimation:YES]; |
| 621 case chrome::NOTIFICATION_PREF_CHANGED: { | |
| 622 const std::string& pref_name = | |
| 623 *content::Details<std::string>(details).ptr(); | |
| 624 DCHECK(pref_name == prefs::kShowBookmarkBar); | |
| 625 [controller_ updateBookmarkBarVisibilityWithAnimation:YES]; | |
| 626 break; | |
| 627 } | |
| 628 default: | |
| 629 NOTREACHED(); // we don't ask for anything else! | |
| 630 break; | |
| 631 } | |
| 632 } | 621 } |
| 633 | 622 |
| 634 extensions::ActiveTabPermissionGranter* | 623 extensions::ActiveTabPermissionGranter* |
| 635 BrowserWindowCocoa::GetActiveTabPermissionGranter() { | 624 BrowserWindowCocoa::GetActiveTabPermissionGranter() { |
| 636 TabContents* tab_contents = | 625 TabContents* tab_contents = |
| 637 browser_->tab_strip_model()->GetActiveTabContents(); | 626 browser_->tab_strip_model()->GetActiveTabContents(); |
| 638 if (!tab_contents) | 627 if (!tab_contents) |
| 639 return NULL; | 628 return NULL; |
| 640 extensions::TabHelper* tab_helper = | 629 extensions::TabHelper* tab_helper = |
| 641 extensions::TabHelper::FromWebContents(tab_contents->web_contents()); | 630 extensions::TabHelper::FromWebContents(tab_contents->web_contents()); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 668 AvatarMenuBubbleController* menu = | 657 AvatarMenuBubbleController* menu = |
| 669 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 658 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
| 670 anchoredAt:point]; | 659 anchoredAt:point]; |
| 671 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; | 660 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; |
| 672 [menu showWindow:nil]; | 661 [menu showWindow:nil]; |
| 673 } | 662 } |
| 674 | 663 |
| 675 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { | 664 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
| 676 [[controller_ avatarButtonController] showAvatarBubble]; | 665 [[controller_ avatarButtonController] showAvatarBubble]; |
| 677 } | 666 } |
| OLD | NEW |