| 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" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 28 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
| 29 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 29 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
| 30 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" | 30 #import "chrome/browser/ui/cocoa/html_dialog_window_controller.h" |
| 31 #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" |
| 32 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" | 32 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" |
| 33 #include "chrome/browser/ui/cocoa/page_info_window.h" | 33 #include "chrome/browser/ui/cocoa/page_info_window.h" |
| 34 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" | 34 #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" |
| 35 #include "chrome/browser/ui/cocoa/restart_browser.h" | 35 #include "chrome/browser/ui/cocoa/restart_browser.h" |
| 36 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" | 36 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" |
| 37 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 37 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
| 38 #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" | |
| 39 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 38 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 40 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 39 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 41 #include "chrome/browser/ui/webui/task_manager_dialog.h" | 40 #include "chrome/browser/ui/webui/task_manager_dialog.h" |
| 42 #include "chrome/common/chrome_notification_types.h" | 41 #include "chrome/common/chrome_notification_types.h" |
| 43 #include "chrome/common/chrome_switches.h" | 42 #include "chrome/common/chrome_switches.h" |
| 44 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
| 45 #include "content/browser/tab_contents/tab_contents.h" | 44 #include "content/browser/tab_contents/tab_contents.h" |
| 46 #include "content/public/browser/notification_source.h" | 45 #include "content/public/browser/notification_source.h" |
| 47 #include "content/public/browser/native_web_keyboard_event.h" | 46 #include "content/public/browser/native_web_keyboard_event.h" |
| 48 #include "content/public/browser/notification_details.h" | 47 #include "content/public/browser/notification_details.h" |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 TabContents* tab_contents) { | 419 TabContents* tab_contents) { |
| 421 RepostFormWarningMac::Create(GetNativeHandle(), tab_contents); | 420 RepostFormWarningMac::Create(GetNativeHandle(), tab_contents); |
| 422 } | 421 } |
| 423 | 422 |
| 424 void BrowserWindowCocoa::ShowCollectedCookiesDialog( | 423 void BrowserWindowCocoa::ShowCollectedCookiesDialog( |
| 425 TabContentsWrapper* wrapper) { | 424 TabContentsWrapper* wrapper) { |
| 426 // Deletes itself on close. | 425 // Deletes itself on close. |
| 427 new CollectedCookiesMac(GetNativeHandle(), wrapper); | 426 new CollectedCookiesMac(GetNativeHandle(), wrapper); |
| 428 } | 427 } |
| 429 | 428 |
| 430 void BrowserWindowCocoa::ShowThemeInstallBubble() { | |
| 431 ThemeInstallBubbleView::Show(window()); | |
| 432 } | |
| 433 | |
| 434 // We allow closing the window here since the real quit decision on Mac is made | 429 // We allow closing the window here since the real quit decision on Mac is made |
| 435 // in [AppController quit:]. | 430 // in [AppController quit:]. |
| 436 void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads() { | 431 void BrowserWindowCocoa::ConfirmBrowserCloseWithPendingDownloads() { |
| 437 // Call InProgressDownloadResponse asynchronously to avoid a crash when the | 432 // Call InProgressDownloadResponse asynchronously to avoid a crash when the |
| 438 // browser window is closed here (http://crbug.com/44454). | 433 // browser window is closed here (http://crbug.com/44454). |
| 439 MessageLoop::current()->PostTask(FROM_HERE, | 434 MessageLoop::current()->PostTask(FROM_HERE, |
| 440 base::Bind(&Browser::InProgressDownloadResponse, | 435 base::Bind(&Browser::InProgressDownloadResponse, |
| 441 confirm_close_factory_.GetWeakPtr(), true)); | 436 confirm_close_factory_.GetWeakPtr(), true)); |
| 442 } | 437 } |
| 443 | 438 |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 616 // |menu| will automatically release itself on close. | 611 // |menu| will automatically release itself on close. |
| 617 AvatarMenuBubbleController* menu = | 612 AvatarMenuBubbleController* menu = |
| 618 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 613 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
| 619 anchoredAt:point]; | 614 anchoredAt:point]; |
| 620 [menu showWindow:nil]; | 615 [menu showWindow:nil]; |
| 621 } | 616 } |
| 622 | 617 |
| 623 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { | 618 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
| 624 [[controller_ avatarButtonController] showAvatarBubble]; | 619 [[controller_ avatarButtonController] showAvatarBubble]; |
| 625 } | 620 } |
| OLD | NEW |