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

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

Issue 1123943002: Move SecurityLevel into a class of its own (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: register in chrome_jni_registrar Created 5 years, 7 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override; 186 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) override;
187 int OnDrop(const ui::OSExchangeData& data) override; 187 int OnDrop(const ui::OSExchangeData& data) override;
188 void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) override; 188 void UpdateContextMenu(ui::SimpleMenuModel* menu_contents) override;
189 189
190 // When true, the location bar view is read only and also is has a slightly 190 // When true, the location bar view is read only and also is has a slightly
191 // different presentation (smaller font size). This is used for popups. 191 // different presentation (smaller font size). This is used for popups.
192 bool popup_window_mode_; 192 bool popup_window_mode_;
193 193
194 scoped_ptr<OmniboxPopupView> popup_view_; 194 scoped_ptr<OmniboxPopupView> popup_view_;
195 195
196 ToolbarModel::SecurityLevel security_level_; 196 ConnectionSecurityHelper::SecurityLevel security_level_;
197 197
198 // Selection persisted across temporary text changes, like popup suggestions. 198 // Selection persisted across temporary text changes, like popup suggestions.
199 gfx::Range saved_temporary_selection_; 199 gfx::Range saved_temporary_selection_;
200 200
201 // Holds the user's selection across focus changes. There is only a saved 201 // Holds the user's selection across focus changes. There is only a saved
202 // selection if this range IsValid(). 202 // selection if this range IsValid().
203 gfx::Range saved_selection_for_focus_change_; 203 gfx::Range saved_selection_for_focus_change_;
204 204
205 // Tracking state before and after a possible change. 205 // Tracking state before and after a possible change.
206 base::string16 text_before_change_; 206 base::string16 text_before_change_;
(...skipping 26 matching lines...) Expand all
233 // painted. Used to measure omnibox responsiveness with a histogram. 233 // painted. Used to measure omnibox responsiveness with a histogram.
234 base::TimeTicks insert_char_time_; 234 base::TimeTicks insert_char_time_;
235 235
236 // Used to bind callback functions to this object. 236 // Used to bind callback functions to this object.
237 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_; 237 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_;
238 238
239 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews); 239 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
240 }; 240 };
241 241
242 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 242 #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