Pulls ActiveWindowWatcher into app so that we can use it in

views. Converts from using notification server to observer as
notification service is chrome only.
Also changes the pointer type used by window_gtk to be a left arrow.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/245016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27398 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 2 deletions

diff --git a/chrome/browser/gtk/browser_titlebar.h b/chrome/browser/gtk/browser_titlebar.h
index f4508be..84d9236 100644
--- a/chrome/browser/gtk/browser_titlebar.h
+++ b/chrome/browser/gtk/browser_titlebar.h
@@ -12,6 +12,7 @@
 
 #include <gtk/gtk.h>
 
+#include "app/active_window_watcher_x.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/common/notification_observer.h"
@@ -24,10 +25,11 @@ class TabContents;
 class TabStripGtk;
 
 class BrowserTitlebar : public MenuGtk::Delegate,
-                        public NotificationObserver {
+                        public NotificationObserver,
+                        public ActiveWindowWatcherX::Observer {
  public:
   BrowserTitlebar(BrowserWindowGtk* browser_window, GtkWindow* window);
-  virtual ~BrowserTitlebar() { }
+  virtual ~BrowserTitlebar();
 
   GtkWidget* widget() {
     return container_;
@@ -118,6 +120,9 @@ class BrowserTitlebar : public MenuGtk::Delegate,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // Overriden from ActiveWindowWatcher::Observer.
+  virtual void ActiveWindowChanged(GdkWindow* active_window);
+
   // Pointers to the browser window that owns us and it's GtkWindow.
   BrowserWindowGtk* browser_window_;
   GtkWindow* window_;