Omnibox M5 work, part 1: Security changes...

chrome/browser/autocomplete/autocomplete_edit_view_gtk.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 40 matching lines @@
                           ToolbarModel* toolbar_model,
                           Profile* profile,
                           CommandUpdater* command_updater,
                           bool popup_window_mode,
                           const BubblePositioner* bubble_positioner);
   ~AutocompleteEditViewGtk();
 
   // Initialize, create the underlying widgets, etc.
   void Init();
 
-  GtkWidget* widget() { return alignment_.get(); }
-
   // Returns the width, in pixels, needed to display the current text. The
   // returned value includes margins and borders.
   int TextWidth();
 
   // Implement the AutocompleteEditView interface.
   virtual AutocompleteEditModel* model() { return model_.get(); }
   virtual const AutocompleteEditModel* model() const { return model_.get(); }
 
   virtual void SaveStateToTab(TabContents* tab);
 
@@ skipping 299 matching lines @@
   // The widget we expose, used for vertically centering the real text edit,
   // since the height will change based on the font / font size, etc.
   OwnedWidgetGtk alignment_;
 
   // The actual text entry which will be owned by the alignment_.
   GtkWidget* text_view_;
 
   GtkTextTagTable* tag_table_;
   GtkTextBuffer* text_buffer_;
   GtkTextTag* faded_text_tag_;
+  GtkTextTag* ev_secure_scheme_tag_;
   GtkTextTag* secure_scheme_tag_;
-  GtkTextTag* insecure_scheme_tag_;
+  GtkTextTag* security_error_scheme_tag_;
   GtkTextTag* normal_text_tag_;
 
   scoped_ptr<AutocompleteEditModel> model_;
   scoped_ptr<AutocompletePopupView> popup_view_;
   AutocompleteEditController* controller_;
   ToolbarModel* toolbar_model_;
 
   // The object that handles additional command functionality exposed on the
   // edit, such as invoking the keyword editor.
   CommandUpdater* command_updater_;
 
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (smaller font size). This is used for popups.
   bool popup_window_mode_;
 
-  ToolbarModel::SecurityLevel scheme_security_level_;
+  ToolbarModel::SecurityLevel security_level_;
 
   // Selection at the point where the user started using the
   // arrows to move around in the popup.
   CharRange saved_temporary_selection_;
 
   // Tracking state before and after a possible change.
   std::wstring text_before_change_;
   CharRange sel_before_change_;
 
   // The most-recently-selected text from the entry.  This is updated on-the-fly
@@ skipping 69 matching lines @@
 
   // Indicate if the tab to search should be enabled or not. It's true by
   // default and will only be set to false if the location bar view is not able
   // to show the tab to search hint.
   bool enable_tab_to_search_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewGtk);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_