| 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" |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/strings/sys_string_conversions.h" | 13 #include "base/strings/sys_string_conversions.h" |
| 14 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
| 15 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
| 16 #include "chrome/browser/download/download_shelf.h" | 16 #include "chrome/browser/download/download_shelf.h" |
| 17 #include "chrome/browser/extensions/extension_util.h" | 17 #include "chrome/browser/extensions/extension_util.h" |
| 18 #include "chrome/browser/extensions/tab_helper.h" | 18 #include "chrome/browser/extensions/tab_helper.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 20 #include "chrome/browser/profiles/profile_window.h" | 20 #include "chrome/browser/profiles/profile_window.h" |
| 21 #include "chrome/browser/shell_integration.h" | 21 #include "chrome/browser/shell_integration.h" |
| 22 #include "chrome/browser/signin/chrome_signin_helper.h" | 22 #include "chrome/browser/signin/chrome_signin_helper.h" |
| 23 #include "chrome/browser/translate/chrome_translate_client.h" | 23 #include "chrome/browser/translate/chrome_translate_client.h" |
| 24 #include "chrome/browser/ui/browser.h" | 24 #include "chrome/browser/ui/browser.h" |
| 25 #include "chrome/browser/ui/browser_command_controller.h" | 25 #include "chrome/browser/ui/browser_command_controller.h" |
| 26 #include "chrome/browser/ui/browser_commands.h" | 26 #include "chrome/browser/ui/browser_commands.h" |
| 27 #include "chrome/browser/ui/browser_dialogs.h" |
| 27 #include "chrome/browser/ui/browser_list.h" | 28 #include "chrome/browser/ui/browser_list.h" |
| 28 #include "chrome/browser/ui/browser_window_state.h" | 29 #include "chrome/browser/ui/browser_window_state.h" |
| 29 #import "chrome/browser/ui/cocoa/autofill/save_card_bubble_view_bridge.h" | 30 #import "chrome/browser/ui/cocoa/autofill/save_card_bubble_view_bridge.h" |
| 30 #import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h" | 31 #import "chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h" |
| 31 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 32 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 32 #import "chrome/browser/ui/cocoa/browser_window_utils.h" | 33 #import "chrome/browser/ui/cocoa/browser_window_utils.h" |
| 33 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 34 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 34 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con
troller.h" | 35 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_con
troller.h" |
| 35 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" | 36 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" |
| 36 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" | 37 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 59 #include "components/translate/core/browser/language_state.h" | 60 #include "components/translate/core/browser/language_state.h" |
| 60 #include "content/public/browser/native_web_keyboard_event.h" | 61 #include "content/public/browser/native_web_keyboard_event.h" |
| 61 #include "content/public/browser/notification_details.h" | 62 #include "content/public/browser/notification_details.h" |
| 62 #include "content/public/browser/notification_service.h" | 63 #include "content/public/browser/notification_service.h" |
| 63 #include "content/public/browser/notification_source.h" | 64 #include "content/public/browser/notification_source.h" |
| 64 #include "content/public/browser/web_contents.h" | 65 #include "content/public/browser/web_contents.h" |
| 65 #include "extensions/browser/extension_registry.h" | 66 #include "extensions/browser/extension_registry.h" |
| 66 #include "extensions/browser/extension_system.h" | 67 #include "extensions/browser/extension_system.h" |
| 67 #include "extensions/common/constants.h" | 68 #include "extensions/common/constants.h" |
| 68 #include "ui/base/l10n/l10n_util_mac.h" | 69 #include "ui/base/l10n/l10n_util_mac.h" |
| 70 #include "ui/base/material_design/material_design_controller.h" |
| 69 #include "ui/events/keycodes/keyboard_codes.h" | 71 #include "ui/events/keycodes/keyboard_codes.h" |
| 70 #include "ui/gfx/geometry/rect.h" | 72 #include "ui/gfx/geometry/rect.h" |
| 71 | 73 |
| 72 #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) | 74 #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) |
| 73 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" | 75 #import "chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h" |
| 74 #endif | 76 #endif |
| 75 | 77 |
| 76 using content::NativeWebKeyboardEvent; | 78 using content::NativeWebKeyboardEvent; |
| 77 using content::WebContents; | 79 using content::WebContents; |
| 78 | 80 |
| (...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 FindBarCocoaController* find_bar_cocoa_controller) { | 520 FindBarCocoaController* find_bar_cocoa_controller) { |
| 519 [controller_ addFindBar:find_bar_cocoa_controller]; | 521 [controller_ addFindBar:find_bar_cocoa_controller]; |
| 520 } | 522 } |
| 521 | 523 |
| 522 void BrowserWindowCocoa::UpdateAlertState(TabAlertState alert_state) { | 524 void BrowserWindowCocoa::UpdateAlertState(TabAlertState alert_state) { |
| 523 alert_state_ = alert_state; | 525 alert_state_ = alert_state; |
| 524 UpdateTitleBar(); | 526 UpdateTitleBar(); |
| 525 } | 527 } |
| 526 | 528 |
| 527 void BrowserWindowCocoa::ShowUpdateChromeDialog() { | 529 void BrowserWindowCocoa::ShowUpdateChromeDialog() { |
| 528 restart_browser::RequestRestart(window()); | 530 if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { |
| 531 chrome::ShowUpdateChromeDialogViews(GetNativeWindow()); |
| 532 } else { |
| 533 restart_browser::RequestRestart(window()); |
| 534 } |
| 529 } | 535 } |
| 530 | 536 |
| 531 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, | 537 void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |
| 532 bool already_bookmarked) { | 538 bool already_bookmarked) { |
| 533 [controller_ showBookmarkBubbleForURL:url | 539 [controller_ showBookmarkBubbleForURL:url |
| 534 alreadyBookmarked:(already_bookmarked ? YES : NO)]; | 540 alreadyBookmarked:(already_bookmarked ? YES : NO)]; |
| 535 } | 541 } |
| 536 | 542 |
| 537 void BrowserWindowCocoa::ShowBookmarkAppBubble( | 543 void BrowserWindowCocoa::ShowBookmarkAppBubble( |
| 538 const WebApplicationInfo& web_app_info, | 544 const WebApplicationInfo& web_app_info, |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() { | 837 ExclusiveAccessContext* BrowserWindowCocoa::GetExclusiveAccessContext() { |
| 832 return [controller_ exclusiveAccessController]; | 838 return [controller_ exclusiveAccessController]; |
| 833 } | 839 } |
| 834 | 840 |
| 835 void BrowserWindowCocoa::ShowImeWarningBubble( | 841 void BrowserWindowCocoa::ShowImeWarningBubble( |
| 836 const extensions::Extension* extension, | 842 const extensions::Extension* extension, |
| 837 const base::Callback<void(ImeWarningBubblePermissionStatus status)>& | 843 const base::Callback<void(ImeWarningBubblePermissionStatus status)>& |
| 838 callback) { | 844 callback) { |
| 839 NOTREACHED() << "The IME warning bubble is unsupported on this platform."; | 845 NOTREACHED() << "The IME warning bubble is unsupported on this platform."; |
| 840 } | 846 } |
| OLD | NEW |