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

Unified Diff: chrome/browser/gtk/browser_toolbar_gtk.h

Issue 5182004: [gtk] use new update badge on wrench menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move to top right Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/upgrade_dot_inactive.png ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/browser_toolbar_gtk.h
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h
index f2e8fecd617423fbc6bd95e483f629aa014dda4d..f55ed2c954f0b3aa0c738fe4821a7e1f6e359f75 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.h
+++ b/chrome/browser/gtk/browser_toolbar_gtk.h
@@ -15,7 +15,6 @@
#include "app/gtk_signal_registrar.h"
#include "app/menus/accelerator.h"
#include "app/menus/simple_menu_model.h"
-#include "app/throb_animation.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/command_updater.h"
#include "chrome/browser/gtk/custom_button.h"
@@ -44,9 +43,7 @@ class ToolbarModel;
class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
public menus::AcceleratorProvider,
public MenuGtk::Delegate,
- public NotificationObserver,
- public AnimationDelegate,
- public ActiveWindowWatcherX::Observer {
+ public NotificationObserver {
public:
explicit BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window);
virtual ~BrowserToolbarGtk();
@@ -112,14 +109,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
// Message that we should react to a state change.
void UpdateTabContents(TabContents* contents, bool should_restore_state);
- // AnimationDelegate implementation ------------------------------------------
- virtual void AnimationEnded(const Animation* animation);
- virtual void AnimationProgressed(const Animation* animation);
- virtual void AnimationCanceled(const Animation* animation);
-
- // ActiveWindowWatcher::Observer implementation ------------------------------
- virtual void ActiveWindowChanged(GdkWindow* active_window);
-
private:
// Connect/Disconnect signals for dragging a url onto the home button.
void SetUpDragForHomeButton(bool enable);
@@ -129,10 +118,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
// was taken (the roundedness was already correct), true otherwise.
bool UpdateRoundedness();
- // Calculates whether the upgrade notification dot should be faded at all
- // (as opposed to solid).
- bool UpgradeAnimationIsFaded();
-
// Gtk callback for the "expose-event" signal.
// The alignment contains the toolbar.
CHROMEGTK_CALLBACK_1(BrowserToolbarGtk, gboolean, OnAlignmentExpose,
@@ -152,9 +137,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
GdkDragContext*, gint, gint, GtkSelectionData*,
guint, guint);
- // Used to stop the upgrade notification animation.
- CHROMEGTK_CALLBACK_0(BrowserToolbarGtk, void, OnWrenchMenuShow);
-
// Used to draw the upgrade notification badge.
CHROMEGTK_CALLBACK_1(BrowserToolbarGtk, gboolean, OnWrenchMenuButtonExpose,
GdkEventExpose*);
@@ -162,10 +144,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
// Updates preference-dependent state.
void NotifyPrefChanged(const std::string* pref);
- // Start the upgrade notification animation if we have detected an upgrade
- // and the current toolbar is focused.
- void MaybeShowUpgradeReminder();
-
static void SetSyncMenuLabel(GtkWidget* widget, gpointer userdata);
// Sometimes we only want to show the location w/o the toolbar buttons (e.g.,
@@ -236,11 +214,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
// Manages the home button drop signal handler.
scoped_ptr<GtkSignalRegistrar> drop_handler_;
- ThrobAnimation upgrade_reminder_animation_;
-
- // We have already shown and dismissed the upgrade reminder animation.
- bool upgrade_reminder_canceled_;
-
DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);
};
« no previous file with comments | « chrome/app/theme/upgrade_dot_inactive.png ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698