summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/controls/button/menu_button.cc5
-rw-r--r--views/view.cc10
-rw-r--r--views/view.h3
3 files changed, 0 insertions, 18 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 3451434..353205d 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -74,11 +74,6 @@ MenuButton::~MenuButton() {
bool MenuButton::Activate() {
SetState(BS_PUSHED);
- // We need to synchronously paint here because subsequently we enter a
- // menu modal loop which will stop this window from updating and
- // receiving the paint message that should be spawned by SetState until
- // after the menu closes.
- PaintNow();
if (menu_delegate_) {
gfx::Rect lb = GetLocalBounds();
diff --git a/views/view.cc b/views/view.cc
index 61ca2d0..12fbf45 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -727,16 +727,6 @@ void View::Paint(gfx::Canvas* canvas) {
}
}
-void View::PaintNow() {
- if (!IsVisible())
- return;
-
- if (parent())
- parent()->PaintNow();
-}
-
-
-
ThemeProvider* View::GetThemeProvider() const {
const Widget* widget = GetWidget();
return widget ? widget->GetThemeProvider() : NULL;
diff --git a/views/view.h b/views/view.h
index 6c0b950..07577c0 100644
--- a/views/view.h
+++ b/views/view.h
@@ -528,9 +528,6 @@ class View : public AcceleratorTarget {
// the hierarchy beneath it.
virtual void Paint(gfx::Canvas* canvas);
- // Paint this View immediately.
- virtual void PaintNow();
-
// The background object is owned by this object and may be NULL.
void set_background(Background* b) { background_.reset(b); }
const Background* background() const { return background_.get(); }