diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 00:09:36 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 00:09:36 +0000 |
commit | dc9f336bce257cd39173e585537161ea70228021 (patch) | |
tree | cac7dcaf1a58351afead16b0d5bc037e8c3cf03f /chrome | |
parent | a3247dd94cbe6bdb626e42bbcad31e0818017c5f (diff) | |
download | chromium_src-dc9f336bce257cd39173e585537161ea70228021.zip chromium_src-dc9f336bce257cd39173e585537161ea70228021.tar.gz chromium_src-dc9f336bce257cd39173e585537161ea70228021.tar.bz2 |
Cleanup: Removing old gtk code from panel controller .
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/555157
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/chromeos/panel_controller.cc | 17 | ||||
-rw-r--r-- | chrome/browser/chromeos/panel_controller.h | 13 |
2 files changed, 0 insertions, 30 deletions
diff --git a/chrome/browser/chromeos/panel_controller.cc b/chrome/browser/chromeos/panel_controller.cc index 0fbcbd8..3e308d9 100644 --- a/chrome/browser/chromeos/panel_controller.cc +++ b/chrome/browser/chromeos/panel_controller.cc @@ -12,11 +12,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "chrome/browser/browser.h" -#if defined(TOOLKIT_VIEWS) #include "chrome/browser/views/frame/browser_view.h" -#else -#include "chrome/browser/gtk/browser_window_gtk.h" -#endif #include "chrome/browser/views/tabs/tab_overview_types.h" #include "chrome/common/x11_util.h" #include "grit/app_resources.h" @@ -78,7 +74,6 @@ static void InitializeResources() { } // namespace -#if defined(TOOLKIT_VIEWS) PanelController::PanelController(BrowserView* browser_window) : browser_window_(browser_window), panel_(browser_window->GetNativeHandle()), @@ -89,18 +84,6 @@ PanelController::PanelController(BrowserView* browser_window) dragging_(false) { Init(browser_window->bounds()); } -#else -PanelController::PanelController(BrowserWindowGtk* browser_window) - : browser_window_(browser_window), - panel_(browser_window->window()), - panel_xid_(x11_util::GetX11WindowFromGtkWidget(GTK_WIDGET(panel_))), - title_window_(NULL), - expanded_(true), - mouse_down_(false), - dragging_(false) { - Init(browser_window->bounds()); -} -#endif void PanelController::Init(const gfx::Rect window_bounds) { gfx::Rect title_bounds( diff --git a/chrome/browser/chromeos/panel_controller.h b/chrome/browser/chromeos/panel_controller.h index 3e20d5d..4276100 100644 --- a/chrome/browser/chromeos/panel_controller.h +++ b/chrome/browser/chromeos/panel_controller.h @@ -9,11 +9,7 @@ #include "views/controls/button/button.h" -#if defined(TOOLKIT_VIEWS) class BrowserView; -#else -class BrowserWindowGtk; -#endif typedef unsigned long XID; namespace views { @@ -29,11 +25,7 @@ namespace chromeos { // Controls interactions with the WM for popups / panels. class PanelController : public views::ButtonListener { public: -#if defined(TOOLKIT_VIEWS) explicit PanelController(BrowserView* browser_window); -#else - explicit PanelController(BrowserWindowGtk* browser_window); -#endif virtual ~PanelController() {} bool TitleMousePressed(const views::MouseEvent& event); @@ -82,11 +74,7 @@ class PanelController : public views::ButtonListener { void Init(const gfx::Rect window_bounds); // Browser window containing content. -#if defined(TOOLKIT_VIEWS) BrowserView* browser_window_; -#else - BrowserWindowGtk* browser_window_; -#endif // Gtk object for content. GtkWindow* panel_; @@ -128,4 +116,3 @@ class PanelController : public views::ButtonListener { } // namespace chromeos #endif // CHROME_BROWSER_CHROMEOS_PANEL_CONTROLLER_H_ - |