| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/autocomplete/autocomplete_edit_view_mac.h" | 5 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" |
| 6 | 6 |
| 7 #include <Carbon/Carbon.h> // kVK_Return | 7 #include <Carbon/Carbon.h> // kVK_Return |
| 8 | 8 |
| 9 #include "app/mac/nsimage_cache.h" | 9 #include "app/mac/nsimage_cache.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 13 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
| 14 #include "chrome/browser/autocomplete/autocomplete_match.h" | 14 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 15 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 15 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
| 16 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" | 16 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" |
| 17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 18 #include "chrome/browser/tab_contents/tab_contents.h" | |
| 19 #include "chrome/browser/ui/cocoa/event_utils.h" | 18 #include "chrome/browser/ui/cocoa/event_utils.h" |
| 20 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 19 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 20 #include "content/browser/tab_contents/tab_contents.h" |
| 21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 22 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
| 23 #include "net/base/escape.h" | 23 #include "net/base/escape.h" |
| 24 #import "third_party/mozilla/NSPasteboard+Utils.h" | 24 #import "third_party/mozilla/NSPasteboard+Utils.h" |
| 25 #include "ui/base/clipboard/clipboard.h" | 25 #include "ui/base/clipboard/clipboard.h" |
| 26 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
| 27 #include "ui/gfx/image.h" | 27 #include "ui/gfx/image.h" |
| 28 #include "ui/gfx/rect.h" | 28 #include "ui/gfx/rect.h" |
| 29 | 29 |
| 30 // Focus-handling between |field_| and |model_| is a bit subtle. | 30 // Focus-handling between |field_| and |model_| is a bit subtle. |
| (...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1117 | 1117 |
| 1118 void AutocompleteEditViewMac::PlaceCaretAt(NSUInteger pos) { | 1118 void AutocompleteEditViewMac::PlaceCaretAt(NSUInteger pos) { |
| 1119 DCHECK(pos <= GetTextLength()); | 1119 DCHECK(pos <= GetTextLength()); |
| 1120 SetSelectedRange(NSMakeRange(pos, pos)); | 1120 SetSelectedRange(NSMakeRange(pos, pos)); |
| 1121 } | 1121 } |
| 1122 | 1122 |
| 1123 bool AutocompleteEditViewMac::IsCaretAtEnd() const { | 1123 bool AutocompleteEditViewMac::IsCaretAtEnd() const { |
| 1124 const NSRange selection = GetSelectedRange(); | 1124 const NSRange selection = GetSelectedRange(); |
| 1125 return selection.length == 0 && selection.location == GetTextLength(); | 1125 return selection.length == 0 && selection.location == GetTextLength(); |
| 1126 } | 1126 } |
| OLD | NEW |