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

Side by Side Diff: chrome/browser/gtk/location_bar_view_gtk.h

Issue 151209: Initial work on Linux tab to search. (Closed)
Patch Set: Dan's comments. Created 11 years, 5 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_GTK_LOCATION_BAR_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
6 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_ 6 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 gboolean HandleExpose(GtkWidget* widget, GdkEventExpose* event); 85 gboolean HandleExpose(GtkWidget* widget, GdkEventExpose* event);
86 86
87 // Set the SSL icon we should be showing. 87 // Set the SSL icon we should be showing.
88 void SetSecurityIcon(ToolbarModel::Icon icon); 88 void SetSecurityIcon(ToolbarModel::Icon icon);
89 89
90 // Sets the text that should be displayed in the info label and its associated 90 // Sets the text that should be displayed in the info label and its associated
91 // tooltip text. Call with an empty string if the info label should be 91 // tooltip text. Call with an empty string if the info label should be
92 // hidden. 92 // hidden.
93 void SetInfoText(); 93 void SetInfoText();
94 94
95 // Set the keyword text for the Search BLAH: keyword box.
96 void SetKeywordLabel(const std::wstring& keyword);
97 // Set the keyword text for the "Press tab to search BLAH" hint box.
98 void SetKeywordHintLabel(const std::wstring& keyword);
99
95 // The outermost widget we want to be hosted. 100 // The outermost widget we want to be hosted.
96 OwnedWidgetGtk hbox_; 101 OwnedWidgetGtk hbox_;
97 102
98 // SSL icons. 103 // SSL icons.
99 GtkWidget* security_icon_align_; 104 GtkWidget* security_icon_align_;
100 GtkWidget* security_lock_icon_image_; 105 GtkWidget* security_lock_icon_image_;
101 GtkWidget* security_warning_icon_image_; 106 GtkWidget* security_warning_icon_image_;
102 // Toolbar info text (EV cert info). 107 // Toolbar info text (EV cert info).
103 GtkWidget* info_label_align_; 108 GtkWidget* info_label_align_;
104 GtkWidget* info_label_; 109 GtkWidget* info_label_;
105 110
111 // Tab to search widgets.
112 GtkWidget* tab_to_search_;
113 GtkWidget* tab_to_search_label_;
114 GtkWidget* tab_to_search_hint_;
115 GtkWidget* tab_to_search_hint_leading_label_;
116 GtkWidget* tab_to_search_hint_icon_;
117 GtkWidget* tab_to_search_hint_trailing_label_;
118
106 scoped_ptr<AutocompleteEditViewGtk> location_entry_; 119 scoped_ptr<AutocompleteEditViewGtk> location_entry_;
107 120
108 Profile* profile_; 121 Profile* profile_;
109 CommandUpdater* command_updater_; 122 CommandUpdater* command_updater_;
110 ToolbarModel* toolbar_model_; 123 ToolbarModel* toolbar_model_;
111 124
112 // We need to hold on to this just to it pass to the edit. 125 // We need to hold on to this just to it pass to the edit.
113 AutocompletePopupPositioner* popup_positioner_; 126 AutocompletePopupPositioner* popup_positioner_;
114 127
115 // When we get an OnAutocompleteAccept notification from the autocomplete 128 // When we get an OnAutocompleteAccept notification from the autocomplete
116 // edit, we save the input string so we can give it back to the browser on 129 // edit, we save the input string so we can give it back to the browser on
117 // the LocationBar interface via GetInputString(). 130 // the LocationBar interface via GetInputString().
118 std::wstring location_input_; 131 std::wstring location_input_;
119 132
120 // The user's desired disposition for how their input should be opened 133 // The user's desired disposition for how their input should be opened
121 WindowOpenDisposition disposition_; 134 WindowOpenDisposition disposition_;
122 135
123 // The transition type to use for the navigation 136 // The transition type to use for the navigation
124 PageTransition::Type transition_; 137 PageTransition::Type transition_;
125 138
126 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 139 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
127 }; 140 };
128 141
129 #endif // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_ 142 #endif // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc ('k') | chrome/browser/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698