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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.h

Issue 1314843007: Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: create SecurityStateModel for chromeos login webview Created 5 years, 3 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 CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) override; 198 void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) override;
199 199
200 Profile* profile_; 200 Profile* profile_;
201 201
202 // When true, the location bar view is read only and also is has a slightly 202 // When true, the location bar view is read only and also is has a slightly
203 // different presentation (smaller font size). This is used for popups. 203 // different presentation (smaller font size). This is used for popups.
204 bool popup_window_mode_; 204 bool popup_window_mode_;
205 205
206 scoped_ptr<OmniboxPopupView> popup_view_; 206 scoped_ptr<OmniboxPopupView> popup_view_;
207 207
208 connection_security::SecurityLevel security_level_; 208 SecurityStateModel::SecurityLevel security_level_;
209 209
210 // Selection persisted across temporary text changes, like popup suggestions. 210 // Selection persisted across temporary text changes, like popup suggestions.
211 gfx::Range saved_temporary_selection_; 211 gfx::Range saved_temporary_selection_;
212 212
213 // Holds the user's selection across focus changes. There is only a saved 213 // Holds the user's selection across focus changes. There is only a saved
214 // selection if this range IsValid(). 214 // selection if this range IsValid().
215 gfx::Range saved_selection_for_focus_change_; 215 gfx::Range saved_selection_for_focus_change_;
216 216
217 // Tracking state before and after a possible change. 217 // Tracking state before and after a possible change.
218 base::string16 text_before_change_; 218 base::string16 text_before_change_;
(...skipping 26 matching lines...) Expand all
245 // painted. Used to measure omnibox responsiveness with a histogram. 245 // painted. Used to measure omnibox responsiveness with a histogram.
246 base::TimeTicks insert_char_time_; 246 base::TimeTicks insert_char_time_;
247 247
248 // Used to bind callback functions to this object. 248 // Used to bind callback functions to this object.
249 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_; 249 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_;
250 250
251 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews); 251 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
252 }; 252 };
253 253
254 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 254 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698