OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
13 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
14 #include "chrome/browser/bookmarks/bookmark_utils.h" | 14 #include "chrome/browser/bookmarks/bookmark_utils.h" |
15 #include "chrome/browser/download/download_shelf.h" | 15 #include "chrome/browser/download/download_shelf.h" |
16 #include "chrome/browser/prefs/pref_service.h" | 16 #include "chrome/browser/prefs/pref_service.h" |
17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 19 #include "chrome/browser/ui/browser_command_controller.h" |
19 #include "chrome/browser/ui/browser_list.h" | 20 #include "chrome/browser/ui/browser_list.h" |
20 #include "chrome/browser/ui/browser_window_state.h" | 21 #include "chrome/browser/ui/browser_window_state.h" |
21 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" | 22 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" |
22 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" | 23 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" |
23 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" | 24 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" |
24 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 25 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
25 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 26 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
26 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 27 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
27 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 28 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
28 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 29 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 | 503 |
503 bool BrowserWindowCocoa::PreHandleKeyboardEvent( | 504 bool BrowserWindowCocoa::PreHandleKeyboardEvent( |
504 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { | 505 const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { |
505 if (![BrowserWindowUtils shouldHandleKeyboardEvent:event]) | 506 if (![BrowserWindowUtils shouldHandleKeyboardEvent:event]) |
506 return false; | 507 return false; |
507 | 508 |
508 int id = [BrowserWindowUtils getCommandId:event]; | 509 int id = [BrowserWindowUtils getCommandId:event]; |
509 if (id == -1) | 510 if (id == -1) |
510 return false; | 511 return false; |
511 | 512 |
512 if (browser_->IsReservedCommandOrKey(id, event)) { | 513 if (browser_->command_controller()->IsReservedCommandOrKey(id, event)) { |
513 return [BrowserWindowUtils handleKeyboardEvent:event.os_event | 514 return [BrowserWindowUtils handleKeyboardEvent:event.os_event |
514 inWindow:window()]; | 515 inWindow:window()]; |
515 } | 516 } |
516 | 517 |
517 DCHECK(is_keyboard_shortcut); | 518 DCHECK(is_keyboard_shortcut); |
518 *is_keyboard_shortcut = true; | 519 *is_keyboard_shortcut = true; |
519 return false; | 520 return false; |
520 } | 521 } |
521 | 522 |
522 void BrowserWindowCocoa::HandleKeyboardEvent( | 523 void BrowserWindowCocoa::HandleKeyboardEvent( |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
645 AvatarMenuBubbleController* menu = | 646 AvatarMenuBubbleController* menu = |
646 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ | 647 [[AvatarMenuBubbleController alloc] initWithBrowser:browser_ |
647 anchoredAt:point]; | 648 anchoredAt:point]; |
648 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; | 649 [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge]; |
649 [menu showWindow:nil]; | 650 [menu showWindow:nil]; |
650 } | 651 } |
651 | 652 |
652 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { | 653 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() { |
653 [[controller_ avatarButtonController] showAvatarBubble]; | 654 [[controller_ avatarButtonController] showAvatarBubble]; |
654 } | 655 } |
OLD | NEW |