| 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 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/ui/browser_tabstrip.h" | 21 #include "chrome/browser/ui/browser_tabstrip.h" |
| 22 #include "chrome/browser/ui/browser_window_state.h" | 22 #include "chrome/browser/ui/browser_window_state.h" |
| 23 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" | 23 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" |
| 24 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" | 24 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" |
| 25 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" | 25 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" |
| 26 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 26 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 27 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 27 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
| 28 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 28 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 29 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 29 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
| 30 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 30 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
| 31 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" | |
| 32 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 31 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| 33 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 32 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 34 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" | 33 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" |
| 35 #include "chrome/browser/ui/cocoa/restart_browser.h" | 34 #include "chrome/browser/ui/cocoa/restart_browser.h" |
| 36 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" | 35 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" |
| 37 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 36 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
| 38 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 37 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 38 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" |
| 39 #include "chrome/browser/ui/page_info_bubble.h" | 39 #include "chrome/browser/ui/page_info_bubble.h" |
| 40 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 40 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
| 41 #include "chrome/common/chrome_notification_types.h" | 41 #include "chrome/common/chrome_notification_types.h" |
| 42 #include "chrome/common/pref_names.h" | 42 #include "chrome/common/pref_names.h" |
| 43 #include "content/public/browser/notification_source.h" | |
| 44 #include "content/public/browser/native_web_keyboard_event.h" | 43 #include "content/public/browser/native_web_keyboard_event.h" |
| 45 #include "content/public/browser/notification_details.h" | 44 #include "content/public/browser/notification_details.h" |
| 45 #include "content/public/browser/notification_source.h" |
| 46 #include "content/public/browser/web_contents.h" | 46 #include "content/public/browser/web_contents.h" |
| 47 #include "grit/chromium_strings.h" | 47 #include "grit/chromium_strings.h" |
| 48 #include "grit/generated_resources.h" | 48 #include "grit/generated_resources.h" |
| 49 #include "ui/base/l10n/l10n_util_mac.h" | 49 #include "ui/base/l10n/l10n_util_mac.h" |
| 50 #include "ui/gfx/rect.h" | 50 #include "ui/gfx/rect.h" |
| 51 | 51 |
| 52 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 52 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 53 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" | 53 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" |
| 54 #endif | 54 #endif |
| 55 | 55 |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 } | 479 } |
| 480 | 480 |
| 481 void BrowserWindowCocoa::WebContentsFocused(WebContents* contents) { | 481 void BrowserWindowCocoa::WebContentsFocused(WebContents* contents) { |
| 482 NOTIMPLEMENTED(); | 482 NOTIMPLEMENTED(); |
| 483 } | 483 } |
| 484 | 484 |
| 485 void BrowserWindowCocoa::ShowPageInfo(WebContents* web_contents, | 485 void BrowserWindowCocoa::ShowPageInfo(WebContents* web_contents, |
| 486 const GURL& url, | 486 const GURL& url, |
| 487 const SSLStatus& ssl, | 487 const SSLStatus& ssl, |
| 488 bool show_history) { | 488 bool show_history) { |
| 489 browser::ShowPageInfoBubble(window(), web_contents, url, ssl, show_history, | 489 chrome::ShowPageInfoBubble(window(), web_contents, url, ssl, show_history, |
| 490 browser_); | 490 browser_); |
| 491 } | 491 } |
| 492 | 492 |
| 493 void BrowserWindowCocoa::ShowWebsiteSettings( | 493 void BrowserWindowCocoa::ShowWebsiteSettings( |
| 494 Profile* profile, | 494 Profile* profile, |
| 495 TabContents* tab_contents, | 495 TabContents* tab_contents, |
| 496 const GURL& url, | 496 const GURL& url, |
| 497 const content::SSLStatus& ssl, | 497 const content::SSLStatus& ssl, |
| 498 bool show_history) { | 498 bool show_history) { |
| 499 } | 499 } |
| 500 | 500 |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 AvatarMenuBubbleController* menu = | 647 AvatarMenuBubbleController* menu = |
| 648 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 648 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
| 649 anchoredAt:point]; | 649 anchoredAt:point]; |
| 650 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; | 650 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; |
| 651 [menu showWindow:nil]; | 651 [menu showWindow:nil]; |
| 652 } | 652 } |
| 653 | 653 |
| 654 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { | 654 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
| 655 [[controller_ avatarButtonController] showAvatarBubble]; | 655 [[controller_ avatarButtonController] showAvatarBubble]; |
| 656 } | 656 } |
| OLD | NEW |