| OLD | NEW | 
|---|
| 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 431 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 442   GtkWidget* drag_icon_; | 442   GtkWidget* drag_icon_; | 
| 443   bool enable_location_drag_; | 443   bool enable_location_drag_; | 
| 444   // TODO(pkasting): Split this label off and move the rest of the items to the | 444   // TODO(pkasting): Split this label off and move the rest of the items to the | 
| 445   // left of the address bar. | 445   // left of the address bar. | 
| 446   GtkWidget* security_info_label_; | 446   GtkWidget* security_info_label_; | 
| 447 | 447 | 
| 448   // Content setting icons. | 448   // Content setting icons. | 
| 449   ui::OwnedWidgetGtk content_setting_hbox_; | 449   ui::OwnedWidgetGtk content_setting_hbox_; | 
| 450   ScopedVector<ContentSettingImageViewGtk> content_setting_views_; | 450   ScopedVector<ContentSettingImageViewGtk> content_setting_views_; | 
| 451 | 451 | 
|  | 452   // Extension page actions. | 
|  | 453   std::vector<ExtensionAction*> page_actions_; | 
|  | 454 | 
| 452   // Extension page action icons. | 455   // Extension page action icons. | 
| 453   ui::OwnedWidgetGtk page_action_hbox_; | 456   ui::OwnedWidgetGtk page_action_hbox_; | 
| 454   ScopedVector<PageActionViewGtk> page_action_views_; | 457   ScopedVector<PageActionViewGtk> page_action_views_; | 
| 455 | 458 | 
| 456   // The widget that contains our tab hints and the location bar. | 459   // The widget that contains our tab hints and the location bar. | 
| 457   GtkWidget* entry_box_; | 460   GtkWidget* entry_box_; | 
| 458 | 461 | 
| 459   // Area on the left shown when in tab to search mode. | 462   // Area on the left shown when in tab to search mode. | 
| 460   GtkWidget* tab_to_search_alignment_; | 463   GtkWidget* tab_to_search_alignment_; | 
| 461   GtkWidget* tab_to_search_box_; | 464   GtkWidget* tab_to_search_box_; | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 517   // The last search keyword that was shown via the |tab_to_search_box_|. | 520   // The last search keyword that was shown via the |tab_to_search_box_|. | 
| 518   string16 last_keyword_; | 521   string16 last_keyword_; | 
| 519 | 522 | 
| 520   // Used to change the visibility of the star decoration. | 523   // Used to change the visibility of the star decoration. | 
| 521   BooleanPrefMember edit_bookmarks_enabled_; | 524   BooleanPrefMember edit_bookmarks_enabled_; | 
| 522 | 525 | 
| 523   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); | 526   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk); | 
| 524 }; | 527 }; | 
| 525 | 528 | 
| 526 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ | 529 #endif  // CHROME_BROWSER_UI_GTK_LOCATION_BAR_VIEW_GTK_H_ | 
| OLD | NEW | 
|---|