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 "app/l10n_util_mac.h" | 5 #include "app/l10n_util_mac.h" |
6 #include "base/gfx/rect.h" | 6 #include "base/gfx/rect.h" |
7 #include "base/keyboard_codes.h" | 7 #include "base/keyboard_codes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" |
11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
12 #include "chrome/browser/browser_list.h" | 12 #include "chrome/browser/browser_list.h" |
| 13 #import "chrome/browser/cocoa/bookmark_manager_controller.h" |
13 #include "chrome/browser/cocoa/browser_window_cocoa.h" | 14 #include "chrome/browser/cocoa/browser_window_cocoa.h" |
14 #import "chrome/browser/cocoa/browser_window_controller.h" | 15 #import "chrome/browser/cocoa/browser_window_controller.h" |
15 #import "chrome/browser/cocoa/bug_report_window_controller.h" | 16 #import "chrome/browser/cocoa/bug_report_window_controller.h" |
16 #import "chrome/browser/cocoa/clear_browsing_data_controller.h" | 17 #import "chrome/browser/cocoa/clear_browsing_data_controller.h" |
17 #import "chrome/browser/cocoa/chrome_browser_window.h" | 18 #import "chrome/browser/cocoa/chrome_browser_window.h" |
18 #import "chrome/browser/cocoa/download_shelf_controller.h" | 19 #import "chrome/browser/cocoa/download_shelf_controller.h" |
19 #import "chrome/browser/cocoa/html_dialog_window_controller.h" | 20 #import "chrome/browser/cocoa/html_dialog_window_controller.h" |
20 #import "chrome/browser/cocoa/import_settings_dialog.h" | 21 #import "chrome/browser/cocoa/import_settings_dialog.h" |
21 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" | 22 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" |
22 #import "chrome/browser/cocoa/nsmenuitem_additions.h" | 23 #import "chrome/browser/cocoa/nsmenuitem_additions.h" |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 | 247 |
247 void BrowserWindowCocoa::ShowAboutChromeDialog() { | 248 void BrowserWindowCocoa::ShowAboutChromeDialog() { |
248 NOTIMPLEMENTED(); | 249 NOTIMPLEMENTED(); |
249 } | 250 } |
250 | 251 |
251 void BrowserWindowCocoa::ShowTaskManager() { | 252 void BrowserWindowCocoa::ShowTaskManager() { |
252 TaskManagerMac::Show(); | 253 TaskManagerMac::Show(); |
253 } | 254 } |
254 | 255 |
255 void BrowserWindowCocoa::ShowBookmarkManager() { | 256 void BrowserWindowCocoa::ShowBookmarkManager() { |
256 NOTIMPLEMENTED(); | 257 [BookmarkManagerController showBookmarkManager:browser_->profile()]; |
257 } | 258 } |
258 | 259 |
259 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, | 260 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |
260 bool already_bookmarked) { | 261 bool already_bookmarked) { |
261 [controller_ showBookmarkBubbleForURL:url | 262 [controller_ showBookmarkBubbleForURL:url |
262 alreadyBookmarked:(already_bookmarked ? YES : NO)]; | 263 alreadyBookmarked:(already_bookmarked ? YES : NO)]; |
263 } | 264 } |
264 | 265 |
265 bool BrowserWindowCocoa::IsDownloadShelfVisible() const { | 266 bool BrowserWindowCocoa::IsDownloadShelfVisible() const { |
266 return [controller_ isDownloadShelfVisible] != NO; | 267 return [controller_ isDownloadShelfVisible] != NO; |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 break; | 513 break; |
513 } | 514 } |
514 } | 515 } |
515 | 516 |
516 void BrowserWindowCocoa::DestroyBrowser() { | 517 void BrowserWindowCocoa::DestroyBrowser() { |
517 [controller_ destroyBrowser]; | 518 [controller_ destroyBrowser]; |
518 | 519 |
519 // at this point the controller is dead (autoreleased), so | 520 // at this point the controller is dead (autoreleased), so |
520 // make sure we don't try to reference it any more. | 521 // make sure we don't try to reference it any more. |
521 } | 522 } |
OLD | NEW |