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

Side by Side Diff: ui/views/controls/separator.h

Issue 2623753002: Native themes: Add separator color (Closed)
Patch Set: Change function order Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « ui/native_theme/native_theme_dark_aura.cc ('k') | ui/views/controls/separator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_SEPARATOR_H_ 5 #ifndef UI_VIEWS_CONTROLS_SEPARATOR_H_
6 #define UI_VIEWS_CONTROLS_SEPARATOR_H_ 6 #define UI_VIEWS_CONTROLS_SEPARATOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 22 matching lines...) Expand all
33 33
34 int size() const { return size_; } 34 int size() const { return size_; }
35 // Preferred size of one axis: height for horizontal separator 35 // Preferred size of one axis: height for horizontal separator
36 // and width for vertical separator 36 // and width for vertical separator
37 void SetPreferredSize(int size); 37 void SetPreferredSize(int size);
38 38
39 // Overridden from View: 39 // Overridden from View:
40 gfx::Size GetPreferredSize() const override; 40 gfx::Size GetPreferredSize() const override;
41 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; 41 void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
42 void OnPaint(gfx::Canvas* canvas) override; 42 void OnPaint(gfx::Canvas* canvas) override;
43 void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
43 const char* GetClassName() const override; 44 const char* GetClassName() const override;
44 45
45 private: 46 private:
47 void SetColorFromNativeTheme();
48
46 const Orientation orientation_; 49 const Orientation orientation_;
47 SkColor color_; 50 SkColor color_;
51 bool color_overridden_;
48 int size_; 52 int size_;
49 53
50 DISALLOW_COPY_AND_ASSIGN(Separator); 54 DISALLOW_COPY_AND_ASSIGN(Separator);
51 }; 55 };
52 56
53 } // namespace views 57 } // namespace views
54 58
55 #endif // UI_VIEWS_CONTROLS_SEPARATOR_H_ 59 #endif // UI_VIEWS_CONTROLS_SEPARATOR_H_
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_dark_aura.cc ('k') | ui/views/controls/separator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698