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

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_border.h

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_ 5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_
6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_ 6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_
7 7
8 #include "base/scoped_observer.h" 8 #include "base/scoped_observer.h"
9 #include "ui/gfx/image/image_skia.h" 9 #include "ui/gfx/image/image_skia.h"
10 #include "ui/native_theme/native_theme.h" 10 #include "ui/native_theme/native_theme.h"
(...skipping 15 matching lines...) Expand all
26 26
27 // Draws a gtk button border, and manages the memory of the resulting pixbufs. 27 // Draws a gtk button border, and manages the memory of the resulting pixbufs.
28 class Gtk2Border : public views::Border, public ui::NativeThemeObserver { 28 class Gtk2Border : public views::Border, public ui::NativeThemeObserver {
29 public: 29 public:
30 Gtk2Border(Gtk2UI* gtk2_ui, 30 Gtk2Border(Gtk2UI* gtk2_ui,
31 views::LabelButton* owning_button, 31 views::LabelButton* owning_button,
32 scoped_ptr<views::LabelButtonBorder> border); 32 scoped_ptr<views::LabelButtonBorder> border);
33 virtual ~Gtk2Border(); 33 virtual ~Gtk2Border();
34 34
35 // Overridden from views::Border: 35 // Overridden from views::Border:
36 virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE; 36 virtual void Paint(const views::View& view, gfx::Canvas* canvas) override;
37 virtual gfx::Insets GetInsets() const OVERRIDE; 37 virtual gfx::Insets GetInsets() const override;
38 virtual gfx::Size GetMinimumSize() const OVERRIDE; 38 virtual gfx::Size GetMinimumSize() const override;
39 39
40 // Overridden from views::NativeThemeChangeObserver: 40 // Overridden from views::NativeThemeChangeObserver:
41 virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) OVERRIDE; 41 virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
42 42
43 private: 43 private:
44 void PaintState(const ui::NativeTheme::State state, 44 void PaintState(const ui::NativeTheme::State state,
45 const ui::NativeTheme::ExtraParams& extra, 45 const ui::NativeTheme::ExtraParams& extra,
46 const gfx::Rect& rect, 46 const gfx::Rect& rect,
47 gfx::Canvas* canvas); 47 gfx::Canvas* canvas);
48 48
49 Gtk2UI* gtk2_ui_; 49 Gtk2UI* gtk2_ui_;
50 50
51 gfx::ImageSkia button_images_[2][views::Button::STATE_COUNT]; 51 gfx::ImageSkia button_images_[2][views::Button::STATE_COUNT];
52 52
53 // The view to which we are a border. We keep track of this so that we can 53 // The view to which we are a border. We keep track of this so that we can
54 // force invalidate the layout on theme changes. 54 // force invalidate the layout on theme changes.
55 views::LabelButton* owning_button_; 55 views::LabelButton* owning_button_;
56 56
57 // The views::Border that we are replacing in native mode. We keep track of 57 // The views::Border that we are replacing in native mode. We keep track of
58 // this for inset information. 58 // this for inset information.
59 scoped_ptr<views::LabelButtonBorder> border_; 59 scoped_ptr<views::LabelButtonBorder> border_;
60 60
61 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_; 61 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(Gtk2Border); 63 DISALLOW_COPY_AND_ASSIGN(Gtk2Border);
64 }; 64 };
65 65
66 } // namespace libgtk2ui 66 } // namespace libgtk2ui
67 67
68 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_ 68 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/app_indicator_icon.h ('k') | chrome/browser/ui/libgtk2ui/gtk2_border.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698