Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(498)

Unified Diff: trunk/src/ui/views/controls/scroll_view.cc

Issue 256683003: Revert 266042 "Automatically call OnNativeThemeChanged when a wi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ui/views/controls/label.cc ('k') | trunk/src/ui/views/controls/textfield/textfield.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/controls/scroll_view.cc
===================================================================
--- trunk/src/ui/views/controls/scroll_view.cc (revision 266071)
+++ trunk/src/ui/views/controls/scroll_view.cc (working copy)
@@ -20,16 +20,23 @@
// Subclass of ScrollView that resets the border when the theme changes.
class ScrollViewWithBorder : public views::ScrollView {
public:
- ScrollViewWithBorder() {}
+ ScrollViewWithBorder() {
+ SetThemeSpecificState();
+ }
// View overrides;
virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE {
+ SetThemeSpecificState();
+ }
+
+ private:
+ void SetThemeSpecificState() {
SetBorder(Border::CreateSolidBorder(
1,
- theme->GetSystemColor(ui::NativeTheme::kColorId_UnfocusedBorderColor)));
+ GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_UnfocusedBorderColor)));
}
- private:
DISALLOW_COPY_AND_ASSIGN(ScrollViewWithBorder);
};
« no previous file with comments | « trunk/src/ui/views/controls/label.cc ('k') | trunk/src/ui/views/controls/textfield/textfield.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698