Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ | 6 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ |
| 7 | 7 |
| 8 #import <Cocoa/Cocoa.h> | 8 #import <Cocoa/Cocoa.h> |
| 9 #include <stddef.h> | 9 #include <stddef.h> |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 } | 24 } |
| 25 | 25 |
| 26 namespace ui { | 26 namespace ui { |
| 27 class Clipboard; | 27 class Clipboard; |
| 28 } | 28 } |
| 29 | 29 |
| 30 // Implements OmniboxView on an AutocompleteTextField. | 30 // Implements OmniboxView on an AutocompleteTextField. |
| 31 class OmniboxViewMac : public OmniboxView, | 31 class OmniboxViewMac : public OmniboxView, |
| 32 public AutocompleteTextFieldObserver { | 32 public AutocompleteTextFieldObserver { |
| 33 public: | 33 public: |
| 34 static NSColor* BaseTextColor(bool inDarkMode); | 34 static SkColor SkBaseTextColor(bool in_dark_mode); |
|
tapted
2016/04/27 02:37:39
I read `Sk` prefixes as belonging to stuff declare
shrike
2016/04/27 16:35:17
Done.
| |
| 35 static NSColor* BaseTextColor(bool in_dark_mode); | |
| 35 | 36 |
| 36 OmniboxViewMac(OmniboxEditController* controller, | 37 OmniboxViewMac(OmniboxEditController* controller, |
| 37 Profile* profile, | 38 Profile* profile, |
| 38 CommandUpdater* command_updater, | 39 CommandUpdater* command_updater, |
| 39 AutocompleteTextField* field); | 40 AutocompleteTextField* field); |
| 40 ~OmniboxViewMac() override; | 41 ~OmniboxViewMac() override; |
| 41 | 42 |
| 42 // For use when switching tabs, this saves the current state onto the tab so | 43 // For use when switching tabs, this saves the current state onto the tab so |
| 43 // that it can be restored during a later call to Update(). | 44 // that it can be restored during a later call to Update(). |
| 44 void SaveStateToTab(content::WebContents* tab); | 45 void SaveStateToTab(content::WebContents* tab); |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 NSRange coalesced_range_update_; | 226 NSRange coalesced_range_update_; |
| 226 | 227 |
| 227 // The time of the first character insert operation that has not yet been | 228 // The time of the first character insert operation that has not yet been |
| 228 // painted. Used to measure omnibox responsiveness with a histogram. | 229 // painted. Used to measure omnibox responsiveness with a histogram. |
| 229 base::TimeTicks insert_char_time_; | 230 base::TimeTicks insert_char_time_; |
| 230 | 231 |
| 231 DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac); | 232 DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac); |
| 232 }; | 233 }; |
| 233 | 234 |
| 234 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ | 235 #endif // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_ |
| OLD | NEW |