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

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

Issue 2934513004: Changed static variable flag to be a bool in the anon namespace. (Closed)
Patch Set: In AppListView: Moved function and variable out of the global scope. In SearchBoxView: Moved variab… Created 3 years, 6 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
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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 AppListViewDelegate* view_delegate_; // Not owned. 115 AppListViewDelegate* view_delegate_; // Not owned.
116 AppListModel* model_; // Owned by the profile-keyed service. 116 AppListModel* model_; // Owned by the profile-keyed service.
117 117
118 views::View* content_container_; // Owned by views hierarchy. 118 views::View* content_container_; // Owned by views hierarchy.
119 SearchBoxImageButton* back_button_; // Owned by views hierarchy. 119 SearchBoxImageButton* back_button_; // Owned by views hierarchy.
120 SearchBoxImageButton* speech_button_; // Owned by views hierarchy. 120 SearchBoxImageButton* speech_button_; // Owned by views hierarchy.
121 views::Textfield* search_box_; // Owned by views hierarchy. 121 views::Textfield* search_box_; // Owned by views hierarchy.
122 views::View* contents_view_; // Owned by views hierarchy. 122 views::View* contents_view_; // Owned by views hierarchy.
123 app_list::AppListView* app_list_view_; // Owned by views hierarchy. 123 app_list::AppListView* app_list_view_; // Owned by views hierarchy.
124 124
125 // The switch that is checked to determine if the fullscreen app list feature
126 // is enabled.
127 bool is_fullscreen_app_list_enabled_;
128
125 SearchBoxFocus focused_view_; // Which element has TAB'd focus. 129 SearchBoxFocus focused_view_; // Which element has TAB'd focus.
126 130
127 DISALLOW_COPY_AND_ASSIGN(SearchBoxView); 131 DISALLOW_COPY_AND_ASSIGN(SearchBoxView);
128 }; 132 };
129 133
130 } // namespace app_list 134 } // namespace app_list
131 135
132 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 136 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698