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

Side by Side Diff: ash/wm/dialog_frame_view.h

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 8 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_WM_DIALOG_FRAME_VIEW_H_ 5 #ifndef ASH_WM_DIALOG_FRAME_VIEW_H_
6 #define ASH_WM_DIALOG_FRAME_VIEW_H_ 6 #define ASH_WM_DIALOG_FRAME_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/views/controls/button/button.h" 9 #include "ui/views/controls/button/button.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
(...skipping 27 matching lines...) Expand all
38 const gfx::Rect& client_bounds) const OVERRIDE; 38 const gfx::Rect& client_bounds) const OVERRIDE;
39 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 39 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
40 virtual void GetWindowMask(const gfx::Size& size, 40 virtual void GetWindowMask(const gfx::Size& size,
41 gfx::Path* window_mask) OVERRIDE; 41 gfx::Path* window_mask) OVERRIDE;
42 virtual void ResetWindowControls() OVERRIDE; 42 virtual void ResetWindowControls() OVERRIDE;
43 virtual void UpdateWindowIcon() OVERRIDE; 43 virtual void UpdateWindowIcon() OVERRIDE;
44 44
45 // Overridden from View: 45 // Overridden from View:
46 virtual std::string GetClassName() const OVERRIDE; 46 virtual std::string GetClassName() const OVERRIDE;
47 virtual void Layout() OVERRIDE; 47 virtual void Layout() OVERRIDE;
48 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 48 virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
49 49
50 // Overridden from views::ButtonListener: 50 // Overridden from views::ButtonListener:
51 virtual void ButtonPressed(views::Button* sender, 51 virtual void ButtonPressed(views::Button* sender,
52 const views::Event& event) OVERRIDE; 52 const views::Event& event) OVERRIDE;
53 53
54 private: 54 private:
55 gfx::Insets GetPaddingInsets() const; 55 gfx::Insets GetPaddingInsets() const;
56 gfx::Insets GetClientInsets() const; 56 gfx::Insets GetClientInsets() const;
57 57
58 gfx::Rect title_display_rect_; 58 gfx::Rect title_display_rect_;
59 59
60 views::ImageButton* close_button_; 60 views::ImageButton* close_button_;
61 61
62 static gfx::Font* title_font_; 62 static gfx::Font* title_font_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(DialogFrameView); 64 DISALLOW_COPY_AND_ASSIGN(DialogFrameView);
65 }; 65 };
66 66
67 } // namespace internal 67 } // namespace internal
68 } // namespace views 68 } // namespace views
69 69
70 #endif // ASH_WM_DIALOG_FRAME_VIEW_H_ 70 #endif // ASH_WM_DIALOG_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698