Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: ui/app_list/views/search_box_view.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/app_list/views/pulsing_block_view.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 void TextChanged() override; 118 void TextChanged() override;
119 119
120 // Overridden from SpeechUIModelObserver: 120 // Overridden from SpeechUIModelObserver:
121 void OnSpeechRecognitionStateChanged( 121 void OnSpeechRecognitionStateChanged(
122 SpeechRecognitionState new_state) override; 122 SpeechRecognitionState new_state) override;
123 123
124 SearchBoxViewDelegate* delegate_; // Not owned. 124 SearchBoxViewDelegate* delegate_; // Not owned.
125 AppListViewDelegate* view_delegate_; // Not owned. 125 AppListViewDelegate* view_delegate_; // Not owned.
126 AppListModel* model_; // Owned by the profile-keyed service. 126 AppListModel* model_; // Owned by the profile-keyed service.
127 127
128 scoped_ptr<AppListMenuViews> menu_; 128 std::unique_ptr<AppListMenuViews> menu_;
129 129
130 views::View* content_container_; // Owned by views hierarchy. 130 views::View* content_container_; // Owned by views hierarchy.
131 views::ImageView* icon_view_; // Owned by views hierarchy. 131 views::ImageView* icon_view_; // Owned by views hierarchy.
132 SearchBoxImageButton* back_button_; // Owned by views hierarchy. 132 SearchBoxImageButton* back_button_; // Owned by views hierarchy.
133 SearchBoxImageButton* speech_button_; // Owned by views hierarchy. 133 SearchBoxImageButton* speech_button_; // Owned by views hierarchy.
134 views::MenuButton* menu_button_; // Owned by views hierarchy. 134 views::MenuButton* menu_button_; // Owned by views hierarchy.
135 views::Textfield* search_box_; // Owned by views hierarchy. 135 views::Textfield* search_box_; // Owned by views hierarchy.
136 views::View* contents_view_; // Owned by views hierarchy. 136 views::View* contents_view_; // Owned by views hierarchy.
137 137
138 SearchBoxFocus focused_view_; // Which element has TAB'd focus. 138 SearchBoxFocus focused_view_; // Which element has TAB'd focus.
139 139
140 DISALLOW_COPY_AND_ASSIGN(SearchBoxView); 140 DISALLOW_COPY_AND_ASSIGN(SearchBoxView);
141 }; 141 };
142 142
143 } // namespace app_list 143 } // namespace app_list
144 144
145 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 145 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/pulsing_block_view.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698