| 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 #import "base/mac/sdk_forward_declarations.h" | 10 #import "base/mac/sdk_forward_declarations.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/fullscreen.h" | 21 #include "chrome/browser/fullscreen.h" |
| 22 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
| 23 #include "chrome/browser/shell_integration.h" | 23 #include "chrome/browser/shell_integration.h" |
| 24 #include "chrome/browser/signin/signin_header_helper.h" | 24 #include "chrome/browser/signin/signin_header_helper.h" |
| 25 #include "chrome/browser/translate/chrome_translate_client.h" | 25 #include "chrome/browser/translate/chrome_translate_client.h" |
| 26 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
| 27 #include "chrome/browser/ui/browser_command_controller.h" | 27 #include "chrome/browser/ui/browser_command_controller.h" |
| 28 #include "chrome/browser/ui/browser_commands_mac.h" | 28 #include "chrome/browser/ui/browser_commands_mac.h" |
| 29 #include "chrome/browser/ui/browser_list.h" | 29 #include "chrome/browser/ui/browser_list.h" |
| 30 #include "chrome/browser/ui/browser_window_state.h" | 30 #include "chrome/browser/ui/browser_window_state.h" |
| 31 #include "chrome/browser/ui/cocoa/key_equivalent_constants.h" | |
| 32 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" | 31 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h" |
| 33 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 32 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 34 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 33 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
| 35 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 34 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 36 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 35 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
| 37 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 36 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
| 38 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 37 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| 38 #include "chrome/browser/ui/cocoa/key_equivalent_constants.h" |
| 39 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 39 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 40 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" | 40 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h" |
| 41 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" | 41 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" |
| 42 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h" | 42 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h" |
| 43 #include "chrome/browser/ui/cocoa/restart_browser.h" | 43 #include "chrome/browser/ui/cocoa/restart_browser.h" |
| 44 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" | 44 #include "chrome/browser/ui/cocoa/status_bubble_mac.h" |
| 45 #include "chrome/browser/ui/cocoa/task_manager_mac.h" | 45 #include "chrome/browser/ui/cocoa/task_manager_mac.h" |
| 46 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 46 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 47 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" | 47 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" |
| 48 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro
ller.h" | 48 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro
ller.h" |
| 49 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 49 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
| 50 #include "chrome/browser/ui/search/search_model.h" | 50 #include "chrome/browser/ui/search/search_model.h" |
| 51 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 51 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 52 #include "chrome/browser/web_applications/web_app.h" | 52 #include "chrome/browser/web_applications/web_app.h" |
| 53 #include "chrome/browser/web_applications/web_app_mac.h" | 53 #include "chrome/browser/web_applications/web_app_mac.h" |
| 54 #include "chrome/common/chrome_switches.h" | 54 #include "chrome/common/chrome_switches.h" |
| 55 #include "chrome/common/pref_names.h" | 55 #include "chrome/common/pref_names.h" |
| 56 #include "chrome/grit/generated_resources.h" | 56 #include "chrome/grit/generated_resources.h" |
| 57 #include "components/translate/core/browser/language_state.h" | 57 #include "components/translate/core/browser/language_state.h" |
| 58 #include "content/public/browser/native_web_keyboard_event.h" | 58 #include "content/public/browser/native_web_keyboard_event.h" |
| 59 #include "content/public/browser/notification_details.h" | 59 #include "content/public/browser/notification_details.h" |
| 60 #include "content/public/browser/notification_source.h" | 60 #include "content/public/browser/notification_source.h" |
| 61 #include "content/public/browser/web_contents.h" | 61 #include "content/public/browser/web_contents.h" |
| 62 #include "extensions/browser/extension_registry.h" |
| 63 #include "extensions/browser/extension_system.h" |
| 64 #include "extensions/browser/pref_names.h" |
| 62 #include "extensions/common/constants.h" | 65 #include "extensions/common/constants.h" |
| 63 #include "extensions/browser/extension_system.h" | |
| 64 #include "extensions/browser/extension_registry.h" | |
| 65 #include "extensions/browser/pref_names.h" | |
| 66 #include "ui/base/l10n/l10n_util_mac.h" | 66 #include "ui/base/l10n/l10n_util_mac.h" |
| 67 #include "ui/gfx/rect.h" | 67 #include "ui/gfx/geometry/rect.h" |
| 68 | 68 |
| 69 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 69 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 70 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" | 70 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" |
| 71 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" | 71 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" |
| 72 #endif | 72 #endif |
| 73 | 73 |
| 74 using content::NativeWebKeyboardEvent; | 74 using content::NativeWebKeyboardEvent; |
| 75 using content::SSLStatus; | 75 using content::SSLStatus; |
| 76 using content::WebContents; | 76 using content::WebContents; |
| 77 | 77 |
| (...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) | 784 if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED) |
| 785 return 0; | 785 return 0; |
| 786 return 40; | 786 return 40; |
| 787 } | 787 } |
| 788 | 788 |
| 789 void BrowserWindowCocoa::ExecuteExtensionCommand( | 789 void BrowserWindowCocoa::ExecuteExtensionCommand( |
| 790 const extensions::Extension* extension, | 790 const extensions::Extension* extension, |
| 791 const extensions::Command& command) { | 791 const extensions::Command& command) { |
| 792 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; | 792 [cocoa_controller() executeExtensionCommand:extension->id() command:command]; |
| 793 } | 793 } |
| OLD | NEW |