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 IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_VIEW_IOS_H_ | 5 #ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_VIEW_IOS_H_ |
| 6 #define IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_VIEW_IOS_H_ | 6 #define IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_VIEW_IOS_H_ |
| 7 | 7 |
| 8 #import <UIKit/UIKit.h> | 8 #import <UIKit/UIKit.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 101 // Creates the clear text UIButton to be used as a right view of |field_|. | 101 // Creates the clear text UIButton to be used as a right view of |field_|. |
| 102 void CreateClearTextIcon(bool is_incognito); | 102 void CreateClearTextIcon(bool is_incognito); |
| 103 | 103 |
| 104 // Updates the view to show the appropriate button (e.g. clear text or voice | 104 // Updates the view to show the appropriate button (e.g. clear text or voice |
| 105 // search) on the right side of |field_|. | 105 // search) on the right side of |field_|. |
| 106 void UpdateRightDecorations(); | 106 void UpdateRightDecorations(); |
| 107 | 107 |
| 108 bool show_hint_text_; | 108 bool show_hint_text_; |
| 109 base::scoped_nsobject<UIButton> clear_text_button_; | 109 base::scoped_nsobject<UIButton> clear_text_button_; |
| 110 std::unique_ptr<OmniboxViewIOS> edit_view_; | 110 std::unique_ptr<OmniboxViewIOS> edit_view_; |
| 111 base::scoped_nsobject<OmniboxClearButtonBridge> clear_button_bridge_; | 111 base::scoped_nsobject<OmniboxClearButtonBridge> clear_button_bridge_; |
|
rohitrao (ping after 24h)
2017/02/24 13:40:31
We have to use scoped_nsobject here, because it's
stkhapugin
2017/03/01 17:43:58
yes
| |
| 112 OmniboxTextFieldIOS* field_; | 112 __unsafe_unretained OmniboxTextFieldIOS* |
| 113 id<LocationBarDelegate> delegate_; | 113 field_; // Should be __weak but is included from non-ARC code. |
|
rohitrao (ping after 24h)
2017/02/24 13:40:31
Nit: if you move the comment to be on the line abo
stkhapugin
2017/03/01 17:43:58
Done.
| |
| 114 __unsafe_unretained id<LocationBarDelegate> | |
| 115 delegate_; // Should be __weak but is included from non-ARC code. | |
| 114 bool is_showing_placeholder_while_collapsed_; | 116 bool is_showing_placeholder_while_collapsed_; |
| 115 }; | 117 }; |
| 116 | 118 |
| 117 #endif // IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_VIEW_IOS_H_ | 119 #endif // IOS_CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_VIEW_IOS_H_ |
| OLD | NEW |