| Index: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h
|
| index 2aa918528e5228d7927968cb4958f09d45de30bf..58b36600d15b3fb3ee63fb286843fdd1db8cb840 100644
|
| --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h
|
| +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h
|
| @@ -27,10 +27,13 @@
|
|
|
| class Browser;
|
| class BrowserActionButton;
|
| -class Extension;
|
| class GtkThemeService;
|
| class Profile;
|
|
|
| +namespace extensions {
|
| +class Extension;
|
| +}
|
| +
|
| typedef struct _GdkDragContext GdkDragContext;
|
| typedef struct _GtkWidget GtkWidget;
|
|
|
| @@ -49,7 +52,7 @@ class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer,
|
| // Returns the widget in use by the BrowserActionButton corresponding to
|
| // |extension|. Used in positioning the ExtensionInstalledBubble for
|
| // BrowserActions.
|
| - GtkWidget* GetBrowserActionWidget(const Extension* extension);
|
| + GtkWidget* GetBrowserActionWidget(const extensions::Extension* extension);
|
|
|
| int button_count() { return extension_button_map_.size(); }
|
|
|
| @@ -87,10 +90,11 @@ class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer,
|
|
|
| // Create the UI for a single browser action. This will stick the button
|
| // at the end of the toolbar.
|
| - void CreateButtonForExtension(const Extension* extension, int index);
|
| + void CreateButtonForExtension(const extensions::Extension* extension,
|
| + int index);
|
|
|
| // Delete resources associated with UI for a browser action.
|
| - void RemoveButtonForExtension(const Extension* extension);
|
| + void RemoveButtonForExtension(const extensions::Extension* extension);
|
|
|
| // Change the visibility of widget() based on whether we have any buttons
|
| // to show.
|
| @@ -106,13 +110,14 @@ class BrowserActionsToolbarGtk : public ExtensionToolbarModel::Observer,
|
| // Returns true if this extension should be shown in this toolbar. This can
|
| // return false if we are in an incognito window and the extension is disabled
|
| // for incognito.
|
| - bool ShouldDisplayBrowserAction(const Extension* extension);
|
| + bool ShouldDisplayBrowserAction(const extensions::Extension* extension);
|
|
|
| // ExtensionToolbarModel::Observer implementation.
|
| - virtual void BrowserActionAdded(const Extension* extension,
|
| + virtual void BrowserActionAdded(const extensions::Extension* extension,
|
| int index) OVERRIDE;
|
| - virtual void BrowserActionRemoved(const Extension* extension) OVERRIDE;
|
| - virtual void BrowserActionMoved(const Extension* extension,
|
| + virtual void BrowserActionRemoved(
|
| + const extensions::Extension* extension) OVERRIDE;
|
| + virtual void BrowserActionMoved(const extensions::Extension* extension,
|
| int index) OVERRIDE;
|
| virtual void ModelLoaded() OVERRIDE;
|
|
|
|
|