summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 14:38:36 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 14:38:36 +0000
commit55dc100b65d59fcca16f64de75e2c985bb7c3bf6 (patch)
treec21dece4201d119fb9e49129e30d4af9f944ac3c /chrome
parent5915a01df45fa8044b956a13ec25c8a3e193df74 (diff)
downloadchromium_src-55dc100b65d59fcca16f64de75e2c985bb7c3bf6.zip
chromium_src-55dc100b65d59fcca16f64de75e2c985bb7c3bf6.tar.gz
chromium_src-55dc100b65d59fcca16f64de75e2c985bb7c3bf6.tar.bz2
views: Factor out ResizeAreaDelegate into its own header file.
R=sky@chromium.org Review URL: http://codereview.chromium.org/8037010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/views/browser_actions_container.cc1
-rw-r--r--chrome/browser/ui/views/browser_actions_container.h7
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index db456de..e06ffa4 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -47,6 +47,7 @@
#include "views/controls/menu/menu_item_view.h"
#include "views/controls/menu/menu_model_adapter.h"
#include "views/controls/menu/menu_runner.h"
+#include "views/controls/resize_area.h"
#include "views/drag_utils.h"
#include "views/metrics.h"
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index 00a14d3..659bd6a 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -24,7 +24,7 @@
#include "ui/base/animation/tween.h"
#include "views/controls/button/menu_button.h"
#include "views/controls/menu/view_menu_delegate.h"
-#include "views/controls/resize_area.h"
+#include "views/controls/resize_area_delegate.h"
#include "views/drag_controller.h"
#include "views/view.h"
@@ -47,6 +47,7 @@ class SlideAnimation;
namespace views {
class MenuItemView;
+class ResizeArea;
}
////////////////////////////////////////////////////////////////////////////////
@@ -260,7 +261,7 @@ class BrowserActionsContainer
: public views::View,
public views::ViewMenuDelegate,
public views::DragController,
- public views::ResizeArea::ResizeAreaDelegate,
+ public views::ResizeAreaDelegate,
public ui::AnimationDelegate,
public ExtensionToolbarModel::Observer,
public BrowserActionOverflowMenuController::Observer,
@@ -345,7 +346,7 @@ class BrowserActionsContainer
const gfx::Point& press_pt,
const gfx::Point& p) OVERRIDE;
- // Overridden from ResizeArea::ResizeAreaDelegate:
+ // Overridden from views::ResizeAreaDelegate:
virtual void OnResize(int resize_amount, bool done_resizing) OVERRIDE;
// Overridden from ui::AnimationDelegate: