summaryrefslogtreecommitdiffstats
path: root/ui/views/view.cc
diff options
context:
space:
mode:
authortapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 02:58:53 +0000
committertapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-11 02:58:53 +0000
commit51170c01e65a7fc493b907dc859c8f26f7d0d414 (patch)
treece0dce6895773731d2150aa59adc31b9f49ffad1 /ui/views/view.cc
parent0972f312ea3147054a67a3eee4e91dedae3fa1a6 (diff)
downloadchromium_src-51170c01e65a7fc493b907dc859c8f26f7d0d414.zip
chromium_src-51170c01e65a7fc493b907dc859c8f26f7d0d414.tar.gz
chromium_src-51170c01e65a7fc493b907dc859c8f26f7d0d414.tar.bz2
Use forward-declares of Border and Background in view.h
The full header is required only for the possible call to the destructors via scoped_ptr::reset(). This CL moves the calls to reset() to the .cc to cut down on some dependencies and encourage some iwyu. BUG=None TBR=pfeldman@chromium.org TEST=No functional changes. Review URL: https://codereview.chromium.org/93883002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view.cc')
-rw-r--r--ui/views/view.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/ui/views/view.cc b/ui/views/view.cc
index c1971d5..ee4ed58 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -36,6 +36,7 @@
#include "ui/native_theme/native_theme.h"
#include "ui/views/accessibility/native_view_accessibility.h"
#include "ui/views/background.h"
+#include "ui/views/border.h"
#include "ui/views/context_menu_controller.h"
#include "ui/views/drag_controller.h"
#include "ui/views/layout/layout_manager.h"
@@ -799,6 +800,14 @@ void View::Paint(gfx::Canvas* canvas) {
PaintCommon(canvas);
}
+void View::set_background(Background* b) {
+ background_.reset(b);
+}
+
+void View::set_border(Border* b) {
+ border_.reset(b);
+}
+
ui::ThemeProvider* View::GetThemeProvider() const {
const Widget* widget = GetWidget();
return widget ? widget->GetThemeProvider() : NULL;