| 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/clipboard/clipboard.h" | 9 #include "app/clipboard/clipboard.h" |
| 10 #include "app/clipboard/scoped_clipboard_writer.h" | 10 #include "app/clipboard/scoped_clipboard_writer.h" |
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 return UTF8ToWide(url.spec()); | 913 return UTF8ToWide(url.spec()); |
| 914 } | 914 } |
| 915 } | 915 } |
| 916 | 916 |
| 917 return std::wstring(); | 917 return std::wstring(); |
| 918 } | 918 } |
| 919 | 919 |
| 920 // static | 920 // static |
| 921 NSFont* AutocompleteEditViewMac::GetFieldFont() { | 921 NSFont* AutocompleteEditViewMac::GetFieldFont() { |
| 922 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 922 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 923 return rb.GetFont(ResourceBundle::BaseFont).nativeFont(); | 923 return rb.GetFont(ResourceBundle::BaseFont).GetNativeFont(); |
| 924 } | 924 } |
| OLD | NEW |