| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/message_loop.h" | 10 #include "base/message_loop.h" |
| 11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 12 #include "chrome/app/chrome_command_ids.h" | 12 #include "chrome/app/chrome_command_ids.h" |
| 13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 13 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 14 #include "chrome/browser/download/download_shelf.h" | 14 #include "chrome/browser/download/download_shelf.h" |
| 15 #include "chrome/browser/prefs/pref_service.h" | 15 #include "chrome/browser/prefs/pref_service.h" |
| 16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/sidebar/sidebar_container.h" | 17 #include "chrome/browser/sidebar/sidebar_container.h" |
| 18 #include "chrome/browser/sidebar/sidebar_manager.h" | 18 #include "chrome/browser/sidebar/sidebar_manager.h" |
| 19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 20 #include "chrome/browser/ui/browser_list.h" | 20 #include "chrome/browser/ui/browser_list.h" |
| 21 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" |
| 21 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" | 22 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" |
| 22 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" | 23 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" |
| 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 24 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 24 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 25 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
| 25 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 26 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 26 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" | 27 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" |
| 27 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 28 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
| 28 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 29 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
| 29 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" | 30 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" |
| 30 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 31 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 611 point.y = NSMaxY(bounds) - rect.bottom(); | 612 point.y = NSMaxY(bounds) - rect.bottom(); |
| 612 point = [view convertPoint:point toView:nil]; | 613 point = [view convertPoint:point toView:nil]; |
| 613 point = [[view window] convertBaseToScreen:point]; | 614 point = [[view window] convertBaseToScreen:point]; |
| 614 | 615 |
| 615 // |menu| will automatically release itself on close. | 616 // |menu| will automatically release itself on close. |
| 616 AvatarMenuBubbleController* menu = | 617 AvatarMenuBubbleController* menu = |
| 617 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 618 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
| 618 anchoredAt:point]; | 619 anchoredAt:point]; |
| 619 [menu showWindow:nil]; | 620 [menu showWindow:nil]; |
| 620 } | 621 } |
| 622 |
| 623 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
| 624 [[controller_ avatarButtonController] showAvatarBubble]; |
| 625 } |
| OLD | NEW |