| Index: chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| index 5863dd987de3dfd4a30878afbc9ddd17365f3024..24e3b959d58b2f438dd7f5f8f3924b7d76076c2c 100644
|
| --- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
|
| @@ -16,7 +16,6 @@
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/api/prefs/pref_member.h"
|
| -#include "chrome/browser/command_observer.h"
|
| #include "chrome/browser/extensions/extension_context_menu_model.h"
|
| #include "chrome/browser/extensions/image_loading_tracker.h"
|
| #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
|
| @@ -61,8 +60,7 @@ class AcceleratorGtk;
|
| class LocationBarViewGtk : public OmniboxEditController,
|
| public LocationBar,
|
| public LocationBarTesting,
|
| - public content::NotificationObserver,
|
| - public CommandObserver {
|
| + public content::NotificationObserver {
|
| public:
|
| explicit LocationBarViewGtk(Browser* browser);
|
| virtual ~LocationBarViewGtk();
|
| @@ -163,9 +161,6 @@ class LocationBarViewGtk : public OmniboxEditController,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| - // CommandObserver:
|
| - virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
|
| -
|
| // Edit background color.
|
| static const GdkColor kBackgroundColor;
|
|
|
| @@ -373,8 +368,6 @@ class LocationBarViewGtk : public OmniboxEditController,
|
| GdkEventButton*);
|
| CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnStarButtonPress,
|
| GdkEventButton*);
|
| - CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean,
|
| - OnChromeToMobileButtonPress, GdkEventButton*);
|
|
|
| // Updates the site type area: changes the icon and shows/hides the EV
|
| // certificate information.
|
| @@ -401,7 +394,7 @@ class LocationBarViewGtk : public OmniboxEditController,
|
| // available horizontal space in the location bar.
|
| void AdjustChildrenVisibility();
|
|
|
| - // Build the zoom, star, and Chrome To Mobile icons.
|
| + // Build the zoom, and star icons.
|
| GtkWidget* CreateIconButton(
|
| GtkWidget** image,
|
| int image_id,
|
| @@ -410,7 +403,6 @@ class LocationBarViewGtk : public OmniboxEditController,
|
| gboolean (click_callback)(GtkWidget*, GdkEventButton*, gpointer));
|
| void CreateZoomButton();
|
| void CreateStarButton();
|
| - void CreateChromeToMobileButton();
|
|
|
| // Update the zoom icon after zoom changes.
|
| void UpdateZoomIcon();
|
| @@ -418,9 +410,6 @@ class LocationBarViewGtk : public OmniboxEditController,
|
| // Update the star icon after it is toggled or the theme changes.
|
| void UpdateStarIcon();
|
|
|
| - // Update the chrome to mobile icon after the theme changes, etc.
|
| - void UpdateChromeToMobileIcon();
|
| -
|
| // Returns true if we should only show the URL and none of the extras like
|
| // the star button or page actions.
|
| bool ShouldOnlyShowLocation();
|
| @@ -437,10 +426,6 @@ class LocationBarViewGtk : public OmniboxEditController,
|
| GtkWidget* star_image_;
|
| bool starred_;
|
|
|
| - // The Chrome To Mobile button and image.
|
| - ui::OwnedWidgetGtk chrome_to_mobile_view_;
|
| - GtkWidget* chrome_to_mobile_image_;
|
| -
|
| // An icon to the left of the address bar.
|
| GtkWidget* site_type_alignment_;
|
| GtkWidget* site_type_event_box_;
|
|
|