chrome/browser/gtk/browser_actions_toolbar_gtk.cc - Issue 337035: Replace ExtensionAction with ExtensionAction2.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/gtk/browser_actions_toolbar_gtk.cc

Issue 337035: Replace ExtensionAction with ExtensionAction2. (Closed)

Patch Set: Remove todo Created 11 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: chrome/browser/gtk/browser_actions_toolbar_gtk.cc

diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc

index 583f8ce3a0bb71a97f1c7bb3a227fe1ba3c6faf6..37a3089c2331fd0770250d9b4f7191d779e0a283 100644

--- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc

+++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc

@@ -19,7 +19,7 @@

#include "chrome/browser/profile.h"

#include "chrome/browser/tab_contents/tab_contents.h"

#include "chrome/common/extensions/extension.h"

-#include "chrome/common/extensions/extension_action2.h"

+#include "chrome/common/extensions/extension_action.h"

#include "chrome/common/gtk_util.h"

#include "chrome/common/notification_details.h"

#include "chrome/common/notification_service.h"

@@ -68,7 +68,7 @@ class BrowserActionButton : public NotificationObserver,

G_CALLBACK(OnExposeEvent), this);

registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,

- Source<ExtensionAction2>(extension->browser_action()));

+ Source<ExtensionAction>(extension->browser_action()));

registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,

NotificationService::AllSources());

@@ -162,7 +162,7 @@ class BrowserActionButton : public NotificationObserver,

if (tab_id < 0)

return FALSE;

- ExtensionAction2* action = button->extension_->browser_action();

+ ExtensionAction* action = button->extension_->browser_action();

if (action->GetBadgeText(tab_id).empty())

return FALSE;