| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/cocoa/browser_window_cocoa.h" | 5 #include "chrome/browser/cocoa/browser_window_cocoa.h" |
| 6 | 6 |
| 7 #include "app/l10n_util_mac.h" | 7 #include "app/l10n_util_mac.h" |
| 8 #include "base/keyboard_codes.h" | 8 #include "base/keyboard_codes.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #import "chrome/browser/cocoa/content_settings_dialog_controller.h" | 21 #import "chrome/browser/cocoa/content_settings_dialog_controller.h" |
| 22 #import "chrome/browser/cocoa/download_shelf_controller.h" | 22 #import "chrome/browser/cocoa/download_shelf_controller.h" |
| 23 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h" | 23 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h" |
| 24 #import "chrome/browser/cocoa/html_dialog_window_controller.h" | 24 #import "chrome/browser/cocoa/html_dialog_window_controller.h" |
| 25 #import "chrome/browser/cocoa/import_settings_dialog.h" | 25 #import "chrome/browser/cocoa/import_settings_dialog.h" |
| 26 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" | 26 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" |
| 27 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h" | 27 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h" |
| 28 #import "chrome/browser/cocoa/nsmenuitem_additions.h" | 28 #import "chrome/browser/cocoa/nsmenuitem_additions.h" |
| 29 #include "chrome/browser/cocoa/page_info_window_mac.h" | 29 #include "chrome/browser/cocoa/page_info_window_mac.h" |
| 30 #include "chrome/browser/cocoa/repost_form_warning_mac.h" | 30 #include "chrome/browser/cocoa/repost_form_warning_mac.h" |
| 31 #include "chrome/browser/cocoa/restart_browser.h" |
| 31 #include "chrome/browser/cocoa/status_bubble_mac.h" | 32 #include "chrome/browser/cocoa/status_bubble_mac.h" |
| 32 #include "chrome/browser/cocoa/task_manager_mac.h" | 33 #include "chrome/browser/cocoa/task_manager_mac.h" |
| 33 #import "chrome/browser/cocoa/theme_install_bubble_view.h" | 34 #import "chrome/browser/cocoa/theme_install_bubble_view.h" |
| 34 #import "chrome/browser/cocoa/toolbar_controller.h" | 35 #import "chrome/browser/cocoa/toolbar_controller.h" |
| 35 #include "chrome/browser/download/download_shelf.h" | 36 #include "chrome/browser/download/download_shelf.h" |
| 36 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 37 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
| 37 #include "chrome/browser/pref_service.h" | 38 #include "chrome/browser/pref_service.h" |
| 38 #include "chrome/browser/profile.h" | 39 #include "chrome/browser/profile.h" |
| 39 #include "chrome/browser/tab_contents/tab_contents.h" | 40 #include "chrome/browser/tab_contents/tab_contents.h" |
| 40 #include "chrome/common/notification_service.h" | 41 #include "chrome/common/notification_service.h" |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 FindBarCocoaController* find_bar_cocoa_controller) { | 279 FindBarCocoaController* find_bar_cocoa_controller) { |
| 279 return [controller_ addFindBar:find_bar_cocoa_controller]; | 280 return [controller_ addFindBar:find_bar_cocoa_controller]; |
| 280 } | 281 } |
| 281 | 282 |
| 282 views::Window* BrowserWindowCocoa::ShowAboutChromeDialog() { | 283 views::Window* BrowserWindowCocoa::ShowAboutChromeDialog() { |
| 283 NOTIMPLEMENTED(); | 284 NOTIMPLEMENTED(); |
| 284 return NULL; | 285 return NULL; |
| 285 } | 286 } |
| 286 | 287 |
| 287 void BrowserWindowCocoa::ShowUpdateChromeDialog() { | 288 void BrowserWindowCocoa::ShowUpdateChromeDialog() { |
| 288 NOTIMPLEMENTED(); | 289 restart_browser::RequestRestart(nil); |
| 289 } | 290 } |
| 290 | 291 |
| 291 void BrowserWindowCocoa::ShowTaskManager() { | 292 void BrowserWindowCocoa::ShowTaskManager() { |
| 292 TaskManagerMac::Show(); | 293 TaskManagerMac::Show(); |
| 293 } | 294 } |
| 294 | 295 |
| 295 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, | 296 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |
| 296 bool already_bookmarked) { | 297 bool already_bookmarked) { |
| 297 [controller_ showBookmarkBubbleForURL:url | 298 [controller_ showBookmarkBubbleForURL:url |
| 298 alreadyBookmarked:(already_bookmarked ? YES : NO)]; | 299 alreadyBookmarked:(already_bookmarked ? YES : NO)]; |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 void BrowserWindowCocoa::DestroyBrowser() { | 575 void BrowserWindowCocoa::DestroyBrowser() { |
| 575 [controller_ destroyBrowser]; | 576 [controller_ destroyBrowser]; |
| 576 | 577 |
| 577 // at this point the controller is dead (autoreleased), so | 578 // at this point the controller is dead (autoreleased), so |
| 578 // make sure we don't try to reference it any more. | 579 // make sure we don't try to reference it any more. |
| 579 } | 580 } |
| 580 | 581 |
| 581 NSWindow* BrowserWindowCocoa::window() const { | 582 NSWindow* BrowserWindowCocoa::window() const { |
| 582 return [controller_ window]; | 583 return [controller_ window]; |
| 583 } | 584 } |
| OLD | NEW |