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

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

Issue 10544185: Order the script badges in the location bar consistently (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 6 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_GTK_LOCATION_BAR_VIEW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 10
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 GtkWidget* drag_icon_; 415 GtkWidget* drag_icon_;
416 bool enable_location_drag_; 416 bool enable_location_drag_;
417 // TODO(pkasting): Split this label off and move the rest of the items to the 417 // TODO(pkasting): Split this label off and move the rest of the items to the
418 // left of the address bar. 418 // left of the address bar.
419 GtkWidget* security_info_label_; 419 GtkWidget* security_info_label_;
420 420
421 // Content setting icons. 421 // Content setting icons.
422 ui::OwnedWidgetGtk content_setting_hbox_; 422 ui::OwnedWidgetGtk content_setting_hbox_;
423 ScopedVector<ContentSettingImageViewGtk> content_setting_views_; 423 ScopedVector<ContentSettingImageViewGtk> content_setting_views_;
424 424
425 // Extension page actions.
426 std::vector<ExtensionAction*> page_actions_;
427
425 // Extension page action icons. 428 // Extension page action icons.
426 ui::OwnedWidgetGtk page_action_hbox_; 429 ui::OwnedWidgetGtk page_action_hbox_;
427 ScopedVector<PageActionViewGtk> page_action_views_; 430 ScopedVector<PageActionViewGtk> page_action_views_;
428 431
429 // The widget that contains our tab hints and the location bar. 432 // The widget that contains our tab hints and the location bar.
430 GtkWidget* entry_box_; 433 GtkWidget* entry_box_;
431 434
432 // Area on the left shown when in tab to search mode. 435 // Area on the left shown when in tab to search mode.
433 GtkWidget* tab_to_search_alignment_; 436 GtkWidget* tab_to_search_alignment_;
434 GtkWidget* tab_to_search_box_; 437 GtkWidget* tab_to_search_box_;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 // The last search keyword that was shown via the |tab_to_search_box_|. 493 // The last search keyword that was shown via the |tab_to_search_box_|.
491 string16 last_keyword_; 494 string16 last_keyword_;
492 495
493 // Used to change the visibility of the star decoration. 496 // Used to change the visibility of the star decoration.
494 BooleanPrefMember edit_bookmarks_enabled_; 497 BooleanPrefMember edit_bookmarks_enabled_;
495 498
496 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); 499 DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
497 }; 500 };
498 501
499 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ 502 #endif // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698