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/download/download_shelf.h" | 14 #include "chrome/browser/download/download_shelf.h" |
15 #include "chrome/browser/extensions/tab_helper.h" | 15 #include "chrome/browser/extensions/tab_helper.h" |
16 #include "chrome/browser/password_manager/password_manager.h" | 16 #include "chrome/browser/password_manager/password_manager.h" |
17 #include "chrome/browser/prefs/pref_service.h" | 17 #include "chrome/browser/prefs/pref_service.h" |
18 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/shell_integration.h" | |
19 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 20 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
20 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
21 #include "chrome/browser/ui/browser_command_controller.h" | 22 #include "chrome/browser/ui/browser_command_controller.h" |
22 #include "chrome/browser/ui/browser_commands.h" | 23 #include "chrome/browser/ui/browser_commands.h" |
23 #include "chrome/browser/ui/browser_list.h" | 24 #include "chrome/browser/ui/browser_list.h" |
24 #include "chrome/browser/ui/browser_tabstrip.h" | 25 #include "chrome/browser/ui/browser_tabstrip.h" |
25 #include "chrome/browser/ui/browser_window_state.h" | 26 #include "chrome/browser/ui/browser_window_state.h" |
26 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" | 27 #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" |
27 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" | 28 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" |
28 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" | 29 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" |
29 #import "chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.h " | 30 #import "chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.h " |
30 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 31 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
31 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 32 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
32 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 33 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
33 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 34 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
34 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 35 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
35 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 36 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
36 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 37 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
37 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" | 38 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" |
38 #include "chrome/browser/ui/cocoa/restart_browser.h" | 39 #include "chrome/browser/ui/cocoa/restart_browser.h" |
39 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" | 40 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" |
40 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 41 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
41 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 42 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
42 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" | 43 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" |
43 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h" | 44 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h" |
44 #include "chrome/browser/ui/page_info_bubble.h" | 45 #include "chrome/browser/ui/page_info_bubble.h" |
46 #include "chrome/browser/ui/web_applications/web_app_ui.h" | |
47 #include "chrome/browser/web_applications/web_app.h" | |
45 #include "chrome/common/chrome_notification_types.h" | 48 #include "chrome/common/chrome_notification_types.h" |
46 #include "chrome/common/pref_names.h" | 49 #include "chrome/common/pref_names.h" |
47 #include "content/public/browser/native_web_keyboard_event.h" | 50 #include "content/public/browser/native_web_keyboard_event.h" |
48 #include "content/public/browser/notification_details.h" | 51 #include "content/public/browser/notification_details.h" |
49 #include "content/public/browser/notification_source.h" | 52 #include "content/public/browser/notification_source.h" |
50 #include "content/public/browser/web_contents.h" | 53 #include "content/public/browser/web_contents.h" |
51 #include "content/public/common/password_form.h" | 54 #include "content/public/common/password_form.h" |
52 #include "grit/chromium_strings.h" | 55 #include "grit/chromium_strings.h" |
53 #include "grit/generated_resources.h" | 56 #include "grit/generated_resources.h" |
54 #include "ui/base/l10n/l10n_util_mac.h" | 57 #include "ui/base/l10n/l10n_util_mac.h" |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
558 } | 561 } |
559 | 562 |
560 void BrowserWindowCocoa::HandleKeyboardEvent( | 563 void BrowserWindowCocoa::HandleKeyboardEvent( |
561 const NativeWebKeyboardEvent& event) { | 564 const NativeWebKeyboardEvent& event) { |
562 if ([BrowserWindowUtils shouldHandleKeyboardEvent:event]) | 565 if ([BrowserWindowUtils shouldHandleKeyboardEvent:event]) |
563 [BrowserWindowUtils handleKeyboardEvent:event.os_event inWindow:window()]; | 566 [BrowserWindowUtils handleKeyboardEvent:event.os_event inWindow:window()]; |
564 } | 567 } |
565 | 568 |
566 void BrowserWindowCocoa::ShowCreateChromeAppShortcutsDialog( | 569 void BrowserWindowCocoa::ShowCreateChromeAppShortcutsDialog( |
567 Profile* profile, const extensions::Extension* app) { | 570 Profile* profile, const extensions::Extension* app) { |
568 NOTIMPLEMENTED(); | 571 ShellIntegration::ShortcutInfo shortcut_info; |
sail
2013/01/15 15:17:39
Could you add a comment that normally you'd want t
jeremya
2013/01/16 02:51:51
Done.
| |
572 web_app::UpdateShortcutInfoForApp(*app, profile, &shortcut_info); | |
573 shortcut_info.create_in_applications_menu = true; | |
574 shortcut_info.create_in_quick_launch_bar = true; | |
575 shortcut_info.create_on_desktop = true; | |
Robert Sesek
2013/01/15 15:18:14
The Desktop, really?
sail
2013/01/15 15:22:02
Not really, we only publish to /Applications (see
jeremya
2013/01/16 02:51:51
Actually the shortcut creator for mac totally igno
| |
576 web_app::CreateShortcuts(shortcut_info); | |
569 } | 577 } |
570 | 578 |
571 void BrowserWindowCocoa::Cut() { | 579 void BrowserWindowCocoa::Cut() { |
572 [NSApp sendAction:@selector(cut:) to:nil from:nil]; | 580 [NSApp sendAction:@selector(cut:) to:nil from:nil]; |
573 } | 581 } |
574 | 582 |
575 void BrowserWindowCocoa::Copy() { | 583 void BrowserWindowCocoa::Copy() { |
576 [NSApp sendAction:@selector(copy:) to:nil from:nil]; | 584 [NSApp sendAction:@selector(copy:) to:nil from:nil]; |
577 } | 585 } |
578 | 586 |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
686 PasswordGenerationBubbleController* controller = | 694 PasswordGenerationBubbleController* controller = |
687 [[PasswordGenerationBubbleController alloc] | 695 [[PasswordGenerationBubbleController alloc] |
688 initWithWindow:browser_->window()->GetNativeWindow() | 696 initWithWindow:browser_->window()->GetNativeWindow() |
689 anchoredAt:point | 697 anchoredAt:point |
690 renderViewHost:web_contents->GetRenderViewHost() | 698 renderViewHost:web_contents->GetRenderViewHost() |
691 passwordManager:PasswordManager::FromWebContents(web_contents) | 699 passwordManager:PasswordManager::FromWebContents(web_contents) |
692 usingGenerator:password_generator | 700 usingGenerator:password_generator |
693 forForm:form]; | 701 forForm:form]; |
694 [controller showWindow:nil]; | 702 [controller showWindow:nil]; |
695 } | 703 } |
OLD | NEW |