| 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 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" |
| 13 #include "chrome/browser/cocoa/page_info_window_mac.h" | 14 #include "chrome/browser/cocoa/page_info_window_mac.h" |
| 14 #include "chrome/browser/cocoa/task_manager_mac.h" | 15 #include "chrome/browser/cocoa/task_manager_mac.h" |
| 15 #include "chrome/browser/browser.h" | 16 #include "chrome/browser/browser.h" |
| 16 #include "chrome/browser/download/download_shelf.h" | 17 #include "chrome/browser/download/download_shelf.h" |
| 17 #include "chrome/common/notification_service.h" | 18 #include "chrome/common/notification_service.h" |
| 18 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
| 19 #include "chrome/common/pref_service.h" | 20 #include "chrome/common/pref_service.h" |
| 20 #include "chrome/common/temp_scaffolding_stubs.h" | 21 #include "chrome/common/temp_scaffolding_stubs.h" |
| 21 #include "chrome/browser/profile.h" | 22 #include "chrome/browser/profile.h" |
| 22 | 23 |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 [[ClearBrowsingDataController alloc] | 251 [[ClearBrowsingDataController alloc] |
| 251 initWithProfile:browser_->profile()]); | 252 initWithProfile:browser_->profile()]); |
| 252 [controller runModalDialog]; | 253 [controller runModalDialog]; |
| 253 } | 254 } |
| 254 | 255 |
| 255 void BrowserWindowCocoa::ShowImportDialog() { | 256 void BrowserWindowCocoa::ShowImportDialog() { |
| 256 NOTIMPLEMENTED(); | 257 NOTIMPLEMENTED(); |
| 257 } | 258 } |
| 258 | 259 |
| 259 void BrowserWindowCocoa::ShowSearchEnginesDialog() { | 260 void BrowserWindowCocoa::ShowSearchEnginesDialog() { |
| 260 NOTIMPLEMENTED(); | 261 [KeywordEditorCocoaController showKeywordEditor:browser_->profile()]; |
| 261 } | 262 } |
| 262 | 263 |
| 263 void BrowserWindowCocoa::ShowPasswordManager() { | 264 void BrowserWindowCocoa::ShowPasswordManager() { |
| 264 NOTIMPLEMENTED(); | 265 NOTIMPLEMENTED(); |
| 265 } | 266 } |
| 266 | 267 |
| 267 void BrowserWindowCocoa::ShowSelectProfileDialog() { | 268 void BrowserWindowCocoa::ShowSelectProfileDialog() { |
| 268 NOTIMPLEMENTED(); | 269 NOTIMPLEMENTED(); |
| 269 } | 270 } |
| 270 | 271 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 break; | 341 break; |
| 341 } | 342 } |
| 342 } | 343 } |
| 343 | 344 |
| 344 void BrowserWindowCocoa::DestroyBrowser() { | 345 void BrowserWindowCocoa::DestroyBrowser() { |
| 345 [controller_ destroyBrowser]; | 346 [controller_ destroyBrowser]; |
| 346 | 347 |
| 347 // at this point the controller is dead (autoreleased), so | 348 // at this point the controller is dead (autoreleased), so |
| 348 // make sure we don't try to reference it any more. | 349 // make sure we don't try to reference it any more. |
| 349 } | 350 } |
| OLD | NEW |