| 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 "app/resource_bundle.h" | |
| 11 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 12 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 13 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 13 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
| 15 #include "chrome/browser/autocomplete/autocomplete_match.h" | 14 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 16 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 15 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
| 17 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" | 16 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" |
| 18 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
| 19 #include "chrome/browser/tab_contents/tab_contents.h" | 18 #include "chrome/browser/tab_contents/tab_contents.h" |
| 20 #include "chrome/browser/ui/cocoa/event_utils.h" | 19 #include "chrome/browser/ui/cocoa/event_utils.h" |
| 21 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 20 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 22 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 23 #include "grit/theme_resources.h" | 22 #include "grit/theme_resources.h" |
| 24 #include "net/base/escape.h" | 23 #include "net/base/escape.h" |
| 25 #import "third_party/mozilla/NSPasteboard+Utils.h" | 24 #import "third_party/mozilla/NSPasteboard+Utils.h" |
| 26 #include "ui/base/clipboard/clipboard.h" | 25 #include "ui/base/clipboard/clipboard.h" |
| 26 #include "ui/base/resource/resource_bundle.h" |
| 27 | 27 |
| 28 // Focus-handling between |field_| and |model_| is a bit subtle. | 28 // Focus-handling between |field_| and |model_| is a bit subtle. |
| 29 // Other platforms detect change of focus, which is inconvenient | 29 // Other platforms detect change of focus, which is inconvenient |
| 30 // without subclassing NSTextField (even with a subclass, the use of a | 30 // without subclassing NSTextField (even with a subclass, the use of a |
| 31 // field editor may complicate things). | 31 // field editor may complicate things). |
| 32 // | 32 // |
| 33 // |model_| doesn't actually do anything when it gains focus, it just | 33 // |model_| doesn't actually do anything when it gains focus, it just |
| 34 // initializes. Visible activity happens only after the user edits. | 34 // initializes. Visible activity happens only after the user edits. |
| 35 // NSTextField delegate receives messages around starting and ending | 35 // NSTextField delegate receives messages around starting and ending |
| 36 // edits, so that suffices to catch focus changes. Since all calls | 36 // edits, so that suffices to catch focus changes. Since all calls |
| (...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1090 } | 1090 } |
| 1091 | 1091 |
| 1092 return std::wstring(); | 1092 return std::wstring(); |
| 1093 } | 1093 } |
| 1094 | 1094 |
| 1095 // static | 1095 // static |
| 1096 NSFont* AutocompleteEditViewMac::GetFieldFont() { | 1096 NSFont* AutocompleteEditViewMac::GetFieldFont() { |
| 1097 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 1097 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 1098 return rb.GetFont(ResourceBundle::BaseFont).GetNativeFont(); | 1098 return rb.GetFont(ResourceBundle::BaseFont).GetNativeFont(); |
| 1099 } | 1099 } |
| OLD | NEW |