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

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

Issue 2973006: Use the extension icon for extension omnibox results instead of the generic (Closed)
Patch Set: fixed mac Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <map> 10 #include <map>
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 355
356 // Extension page action icons. 356 // Extension page action icons.
357 OwnedWidgetGtk page_action_hbox_; 357 OwnedWidgetGtk page_action_hbox_;
358 ScopedVector<PageActionViewGtk> page_action_views_; 358 ScopedVector<PageActionViewGtk> page_action_views_;
359 359
360 // The widget that contains our tab hints and the location bar. 360 // The widget that contains our tab hints and the location bar.
361 GtkWidget* entry_box_; 361 GtkWidget* entry_box_;
362 362
363 // Area on the left shown when in tab to search mode. 363 // Area on the left shown when in tab to search mode.
364 GtkWidget* tab_to_search_box_; 364 GtkWidget* tab_to_search_box_;
365 GtkWidget* tab_to_search_magnifier_;
365 GtkWidget* tab_to_search_full_label_; 366 GtkWidget* tab_to_search_full_label_;
366 GtkWidget* tab_to_search_partial_label_; 367 GtkWidget* tab_to_search_partial_label_;
367 368
368 // Hint to user that they can tab-to-search by hitting tab. 369 // Hint to user that they can tab-to-search by hitting tab.
369 GtkWidget* tab_to_search_hint_; 370 GtkWidget* tab_to_search_hint_;
370 GtkWidget* tab_to_search_hint_leading_label_; 371 GtkWidget* tab_to_search_hint_leading_label_;
371 GtkWidget* tab_to_search_hint_icon_; 372 GtkWidget* tab_to_search_hint_icon_;
372 GtkWidget* tab_to_search_hint_trailing_label_; 373 GtkWidget* tab_to_search_hint_trailing_label_;
373 374
374 scoped_ptr<AutocompleteEditViewGtk> location_entry_; 375 scoped_ptr<AutocompleteEditViewGtk> location_entry_;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 // Width of the hbox that holds |tab_to_search_box_|, |location_entry_| and 411 // Width of the hbox that holds |tab_to_search_box_|, |location_entry_| and
411 // |tab_to_search_hint_|. 412 // |tab_to_search_hint_|.
412 int entry_box_width_; 413 int entry_box_width_;
413 414
414 // Indicate if |tab_to_search_box_| should be shown. 415 // Indicate if |tab_to_search_box_| should be shown.
415 bool show_selected_keyword_; 416 bool show_selected_keyword_;
416 417
417 // Indicate if |tab_to_search_hint_| should be shown. 418 // Indicate if |tab_to_search_hint_| should be shown.
418 bool show_keyword_hint_; 419 bool show_keyword_hint_;
419 420
421 // The last search keyword that was shown via the |tab_to_search_box_|.
422 std::wstring last_keyword_;
423
420 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 424 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
421 }; 425 };
422 426
423 #endif // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_ 427 #endif // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extensions_service.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