| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/gfx/rect.h" | 5 #include "base/gfx/rect.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
| 8 #include "chrome/browser/bookmarks/bookmark_utils.h" | 8 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 9 #include "chrome/browser/cocoa/browser_window_cocoa.h" | 9 #include "chrome/browser/cocoa/browser_window_cocoa.h" |
| 10 #import "chrome/browser/cocoa/browser_window_controller.h" | 10 #import "chrome/browser/cocoa/browser_window_controller.h" |
| 11 #import "chrome/browser/cocoa/clear_browsing_data_controller.h" | 11 #import "chrome/browser/cocoa/clear_browsing_data_controller.h" |
| 12 #import "chrome/browser/cocoa/download_shelf_controller.h" | 12 #import "chrome/browser/cocoa/download_shelf_controller.h" |
| 13 #include "chrome/browser/cocoa/page_info_window_mac.h" | 13 #include "chrome/browser/cocoa/page_info_window_mac.h" |
| 14 #include "chrome/browser/cocoa/task_manager_mac.h" |
| 14 #include "chrome/browser/browser.h" | 15 #include "chrome/browser/browser.h" |
| 15 #include "chrome/browser/download/download_shelf.h" | 16 #include "chrome/browser/download/download_shelf.h" |
| 16 #include "chrome/common/notification_service.h" | 17 #include "chrome/common/notification_service.h" |
| 17 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
| 18 #include "chrome/common/pref_service.h" | 19 #include "chrome/common/pref_service.h" |
| 19 #include "chrome/common/temp_scaffolding_stubs.h" | 20 #include "chrome/common/temp_scaffolding_stubs.h" |
| 20 #include "chrome/browser/profile.h" | 21 #include "chrome/browser/profile.h" |
| 21 | 22 |
| 22 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, | 23 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, |
| 23 BrowserWindowController* controller, | 24 BrowserWindowController* controller, |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 void BrowserWindowCocoa::AddFindBar( | 195 void BrowserWindowCocoa::AddFindBar( |
| 195 FindBarCocoaController* find_bar_cocoa_controller) { | 196 FindBarCocoaController* find_bar_cocoa_controller) { |
| 196 return [controller_ addFindBar:find_bar_cocoa_controller]; | 197 return [controller_ addFindBar:find_bar_cocoa_controller]; |
| 197 } | 198 } |
| 198 | 199 |
| 199 void BrowserWindowCocoa::ShowAboutChromeDialog() { | 200 void BrowserWindowCocoa::ShowAboutChromeDialog() { |
| 200 NOTIMPLEMENTED(); | 201 NOTIMPLEMENTED(); |
| 201 } | 202 } |
| 202 | 203 |
| 203 void BrowserWindowCocoa::ShowTaskManager() { | 204 void BrowserWindowCocoa::ShowTaskManager() { |
| 204 NOTIMPLEMENTED(); | 205 TaskManagerMac::Show(); |
| 205 } | 206 } |
| 206 | 207 |
| 207 void BrowserWindowCocoa::ShowBookmarkManager() { | 208 void BrowserWindowCocoa::ShowBookmarkManager() { |
| 208 NOTIMPLEMENTED(); | 209 NOTIMPLEMENTED(); |
| 209 } | 210 } |
| 210 | 211 |
| 211 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, | 212 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |
| 212 bool already_bookmarked) { | 213 bool already_bookmarked) { |
| 213 [controller_ showBookmarkBubbleForURL:url | 214 [controller_ showBookmarkBubbleForURL:url |
| 214 alreadyBookmarked:(already_bookmarked ? YES : NO)]; | 215 alreadyBookmarked:(already_bookmarked ? YES : NO)]; |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 break; | 317 break; |
| 317 } | 318 } |
| 318 } | 319 } |
| 319 | 320 |
| 320 void BrowserWindowCocoa::DestroyBrowser() { | 321 void BrowserWindowCocoa::DestroyBrowser() { |
| 321 [controller_ destroyBrowser]; | 322 [controller_ destroyBrowser]; |
| 322 | 323 |
| 323 // at this point the controller is dead (autoreleased), so | 324 // at this point the controller is dead (autoreleased), so |
| 324 // make sure we don't try to reference it any more. | 325 // make sure we don't try to reference it any more. |
| 325 } | 326 } |
| OLD | NEW |