diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 14:38:36 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 14:38:36 +0000 |
commit | 55dc100b65d59fcca16f64de75e2c985bb7c3bf6 (patch) | |
tree | c21dece4201d119fb9e49129e30d4af9f944ac3c | |
parent | 5915a01df45fa8044b956a13ec25c8a3e193df74 (diff) | |
download | chromium_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
-rw-r--r-- | chrome/browser/ui/views/browser_actions_container.cc | 1 | ||||
-rw-r--r-- | chrome/browser/ui/views/browser_actions_container.h | 7 | ||||
-rw-r--r-- | views/controls/resize_area.cc | 1 | ||||
-rw-r--r-- | views/controls/resize_area.h | 18 | ||||
-rw-r--r-- | views/controls/resize_area_delegate.h | 29 | ||||
-rw-r--r-- | views/views.gyp | 3 |
6 files changed, 39 insertions, 20 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: diff --git a/views/controls/resize_area.cc b/views/controls/resize_area.cc index 951c82d..6492d11 100644 --- a/views/controls/resize_area.cc +++ b/views/controls/resize_area.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" +#include "views/controls/resize_area_delegate.h" #if defined(OS_LINUX) #include "ui/gfx/gtk_util.h" diff --git a/views/controls/resize_area.h b/views/controls/resize_area.h index 9211229..3f06a1e 100644 --- a/views/controls/resize_area.h +++ b/views/controls/resize_area.h @@ -12,6 +12,8 @@ namespace views { +class ResizeAreaDelegate; + //////////////////////////////////////////////////////////////////////////////// // // An invisible area that acts like a horizontal resizer. @@ -19,22 +21,6 @@ namespace views { //////////////////////////////////////////////////////////////////////////////// class VIEWS_EXPORT ResizeArea : public View { public: - ////////////////////////////////////////////////////////////////////////////// - // - // The interface needed for getting notified about the resize event. - // - ////////////////////////////////////////////////////////////////////////////// - class ResizeAreaDelegate { - public: - // OnResize is sent when resizing is detected. |resize_amount| specifies the - // number of pixels that the user wants to resize by, and can be negative or - // positive (depending on direction of dragging and flips according to - // locale directionality: dragging to the left in LTR locales gives negative - // |resize_amount| but positive amount for RTL). |done_resizing| is true if - // the user has released the mouse. - virtual void OnResize(int resize_amount, bool done_resizing) = 0; - }; - static const char kViewClassName[]; explicit ResizeArea(ResizeAreaDelegate* delegate); diff --git a/views/controls/resize_area_delegate.h b/views/controls/resize_area_delegate.h new file mode 100644 index 0000000..041495f --- /dev/null +++ b/views/controls/resize_area_delegate.h @@ -0,0 +1,29 @@ +// Copyright (c) 2011 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 VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ +#define VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ +#pragma once + +namespace views { + +// An interface implemented by objects that want to be notified about the resize +// event. +class ResizeAreaDelegate { + public: + // OnResize is sent when resizing is detected. |resize_amount| specifies the + // number of pixels that the user wants to resize by, and can be negative or + // positive (depending on direction of dragging and flips according to + // locale directionality: dragging to the left in LTR locales gives negative + // |resize_amount| but positive amount for RTL). |done_resizing| is true if + // the user has released the mouse. + virtual void OnResize(int resize_amount, bool done_resizing) = 0; + + protected: + virtual ~ResizeAreaDelegate() {} +}; + +} // namespace views + +#endif // VIEWS_CONTROLS_RESIZE_AREA_DELEGATE_H_ diff --git a/views/views.gyp b/views/views.gyp index 85619a3..96a2433 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -24,7 +24,7 @@ 'sources/': [ ['exclude', '_win\\.(h|cc)$'], ['exclude', '_gtk\\.(h|cc)$'], ['exclude', '_x\\.(h|cc)$'] ], - }], + }], ], }, 'targets': [ @@ -179,6 +179,7 @@ 'controls/progress_bar.cc', 'controls/resize_area.cc', 'controls/resize_area.h', + 'controls/resize_area_delegate.h', 'controls/scroll_view.cc', 'controls/scroll_view.h', 'controls/scrollbar/base_scroll_bar.cc', |