Popup changes

chrome/browser/gtk/browser_window_gtk.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
 #define CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
 
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/x11_util.h"
 
 class BookmarkBarGtk;
 class Browser;
 class BrowserTitlebar;
 class BrowserToolbarGtk;
 class CustomDrawButton;
 class DownloadShelfGtk;
 class FindBarGtk;
 class InfoBarContainerGtk;
 class LocationBar;
 class StatusBubbleGtk;
 class TabContentsContainerGtk;
 class TabStripGtk;
 
+#ifdef LINUX2
+class PanelController;
+#endif
+
 // An implementation of BrowserWindow for GTK.
 // Cross-platform code will interact with this object when
 // it needs to manipulate the window.
 
 class BrowserWindowGtk : public BrowserWindow,
                          public NotificationObserver,
                          public TabStripModelObserver {
  public:
   explicit BrowserWindowGtk(Browser* browser);
   virtual ~BrowserWindowGtk();
@@ skipping 98 matching lines @@
       gfx::NativeWindow window);
 
   // Retrieves the GtkWindow associated with |xid|, which is the X Window
   // ID of the top-level X window of this object.
   static GtkWindow* GetBrowserWindowForXID(XID xid);
 
   Browser* browser() {
     return browser_.get();
   }
 
+  GtkWindow* window() { return window_; }
+
  protected:
   virtual void DestroyBrowser();
   // Top level window.
   GtkWindow* window_;
   // GtkAlignment that holds the interior components of the chromium window.
   GtkWidget* window_container_;
   // VBox that holds everything below the tabs.
   GtkWidget* content_vbox_;
   // VBox that holds everything below the toolbar.
   GtkWidget* render_area_vbox_;
@@ skipping 123 matching lines @@
   // The timer used to update frames for the Loading Animation.
   base::RepeatingTimer<BrowserWindowGtk> loading_animation_timer_;
 
   // Whether we're showing the custom chrome frame or the window manager
   // decorations.
   BooleanPrefMember use_custom_frame_;
 
 #if defined(LINUX2)
   // True if a drag is active. See description above setter for details.
   bool drag_active_;
+  // Controls interactions with the window manager for popup panels.
+  PanelController* panel_controller_;
 #endif
 
   // A map which translates an X Window ID into its respective GtkWindow.
   static std::map<XID, GtkWindow*> xid_map_;
 
   // The current window cursor.  We set it to a resize cursor when over the
   // custom frame border.  We set it to NULL if we want the default cursor.
   GdkCursor* frame_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BROWSER_WINDOW_GTK_H_