| 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/omnibox/omnibox_view_mac.h" | 5 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" |
| 6 | 6 |
| 7 #include <Carbon/Carbon.h> // kVK_Return | 7 #include <Carbon/Carbon.h> // kVK_Return |
| 8 | 8 |
| 9 #include "base/mac/foundation_util.h" | 9 #include "base/mac/foundation_util.h" |
| 10 #import "base/mac/sdk_forward_declarations.h" |
| 10 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 11 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 12 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 13 #include "base/strings/sys_string_conversions.h" | 14 #include "base/strings/sys_string_conversions.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 15 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 16 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" |
| 16 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 17 #include "chrome/browser/search/search.h" | 18 #include "chrome/browser/search/search.h" |
| 18 #include "chrome/browser/themes/theme_service.h" | 19 #include "chrome/browser/themes/theme_service.h" |
| 19 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 20 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 40 #include "ui/base/clipboard/clipboard_util_mac.h" | 41 #include "ui/base/clipboard/clipboard_util_mac.h" |
| 41 #import "ui/base/cocoa/cocoa_base_utils.h" | 42 #import "ui/base/cocoa/cocoa_base_utils.h" |
| 42 #import "ui/base/l10n/l10n_util_mac.h" | 43 #import "ui/base/l10n/l10n_util_mac.h" |
| 43 #include "ui/base/material_design/material_design_controller.h" | 44 #include "ui/base/material_design/material_design_controller.h" |
| 44 #include "ui/base/resource/resource_bundle.h" | 45 #include "ui/base/resource/resource_bundle.h" |
| 45 #include "ui/gfx/color_palette.h" | 46 #include "ui/gfx/color_palette.h" |
| 46 #include "ui/gfx/font.h" | 47 #include "ui/gfx/font.h" |
| 47 #include "ui/gfx/font_list.h" | 48 #include "ui/gfx/font_list.h" |
| 48 #include "ui/gfx/geometry/rect.h" | 49 #include "ui/gfx/geometry/rect.h" |
| 49 | 50 |
| 50 // TODO(ellyjones): Remove this when the deployment target is 10.9 or later. | |
| 51 extern NSString* const NSAccessibilityPriorityKey; | |
| 52 | |
| 53 using content::WebContents; | 51 using content::WebContents; |
| 54 | 52 |
| 55 // Focus-handling between |field_| and model() is a bit subtle. | 53 // Focus-handling between |field_| and model() is a bit subtle. |
| 56 // Other platforms detect change of focus, which is inconvenient | 54 // Other platforms detect change of focus, which is inconvenient |
| 57 // without subclassing NSTextField (even with a subclass, the use of a | 55 // without subclassing NSTextField (even with a subclass, the use of a |
| 58 // field editor may complicate things). | 56 // field editor may complicate things). |
| 59 // | 57 // |
| 60 // model() doesn't actually do anything when it gains focus, it just | 58 // model() doesn't actually do anything when it gains focus, it just |
| 61 // initializes. Visible activity happens only after the user edits. | 59 // initializes. Visible activity happens only after the user edits. |
| 62 // NSTextField delegate receives messages around starting and ending | 60 // NSTextField delegate receives messages around starting and ending |
| (...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1157 display_text); | 1155 display_text); |
| 1158 NSDictionary* notification_info = @{ | 1156 NSDictionary* notification_info = @{ |
| 1159 NSAccessibilityAnnouncementKey : announcement, | 1157 NSAccessibilityAnnouncementKey : announcement, |
| 1160 NSAccessibilityPriorityKey : @(NSAccessibilityPriorityHigh) | 1158 NSAccessibilityPriorityKey : @(NSAccessibilityPriorityHigh) |
| 1161 }; | 1159 }; |
| 1162 NSAccessibilityPostNotificationWithUserInfo( | 1160 NSAccessibilityPostNotificationWithUserInfo( |
| 1163 [field_ window], | 1161 [field_ window], |
| 1164 NSAccessibilityAnnouncementRequestedNotification, | 1162 NSAccessibilityAnnouncementRequestedNotification, |
| 1165 notification_info); | 1163 notification_info); |
| 1166 } | 1164 } |
| OLD | NEW |