summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/gfx/native_theme_base.cc4
-rw-r--r--ui/views/touchui/touch_selection_controller_impl.cc6
2 files changed, 4 insertions, 6 deletions
diff --git a/ui/gfx/native_theme_base.cc b/ui/gfx/native_theme_base.cc
index bea60df..036b4de 100644
--- a/ui/gfx/native_theme_base.cc
+++ b/ui/gfx/native_theme_base.cc
@@ -671,9 +671,7 @@ void NativeThemeBase::PaintMenuPopupBackground(
State state,
const gfx::Rect& rect,
const MenuListExtraParams& menu_list) const {
- // This is the same as COLOR_TOOLBAR.
- canvas->drawColor(SkColorSetRGB(210, 225, 246),
- SkXfermode::kSrc_Mode);
+ canvas->drawColor(SkColorSetRGB(210, 225, 246), SkXfermode::kSrc_Mode);
}
void NativeThemeBase::PaintMenuItemBackground(
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index a2ba44c..47dedf6 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -279,14 +279,14 @@ class TouchSelectionControllerImpl::TouchContextMenuView
canvas->DrawRect(GetLocalBounds(), paint);
#else
- // This is the same as COLOR_TOOLBAR.
canvas->GetSkCanvas()->drawColor(SkColorSetRGB(210, 225, 246),
SkXfermode::kSrc_Mode);
#endif
}
- // ButtonListener
- virtual void ButtonPressed(Button* sender, const views::Event& event) {
+ // Overridden from ButtonListener:
+ virtual void ButtonPressed(Button* sender,
+ const views::Event& event) OVERRIDE {
controller_->ExecuteCommand(sender->tag());
}