Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 8110003: Show avatar menu from NTP4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac build Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_menu_bubble_controller.h"
21 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" 22 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"
22 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 23 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
23 #import "chrome/browser/ui/cocoa/browser_window_utils.h" 24 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
24 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" 25 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
25 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" 26 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
26 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" 27 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
27 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" 28 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
28 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" 29 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h"
29 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 30 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
30 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" 31 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 583
583 NSWindow* BrowserWindowCocoa::window() const { 584 NSWindow* BrowserWindowCocoa::window() const {
584 return [controller_ window]; 585 return [controller_ window];
585 } 586 }
586 587
587 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { 588 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
588 if (tab_contents == browser_->GetSelectedTabContents()) { 589 if (tab_contents == browser_->GetSelectedTabContents()) {
589 [controller_ updateSidebarForContents:tab_contents]; 590 [controller_ updateSidebarForContents:tab_contents];
590 } 591 }
591 } 592 }
593
594 void BrowserWindowCocoa::ShowAvatarBubble(TabContents* tab_contents,
595 const gfx::Rect& rect) {
596 NSView* view = tab_contents->GetNativeView();
597 NSPoint point = NSMakePoint(rect.right(), rect.bottom());
598 point = [view convertPoint:point toView:nil];
599 point = [[view window] convertBaseToScreen:point];
600
601 // |menu| will automatically release itself on close.
602 AvatarMenuBubbleController* menu =
603 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_
604 anchoredAt:point];
605 [menu showWindow:nil];
606 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698