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

Side by Side Diff: ui/views/controls/native/native_view_host.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) 2011 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 UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_H_ 5 #ifndef UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_H_
6 #define UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_H_ 6 #define UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "ui/gfx/native_widget_types.h" 11 #include "ui/gfx/native_widget_types.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 } 71 }
72 72
73 // Accessor for |native_view_|. 73 // Accessor for |native_view_|.
74 gfx::NativeView native_view() const { return native_view_; } 74 gfx::NativeView native_view() const { return native_view_; }
75 75
76 void NativeViewDestroyed(); 76 void NativeViewDestroyed();
77 77
78 // Overridden from View: 78 // Overridden from View:
79 virtual gfx::Size GetPreferredSize() OVERRIDE; 79 virtual gfx::Size GetPreferredSize() OVERRIDE;
80 virtual void Layout() OVERRIDE; 80 virtual void Layout() OVERRIDE;
81 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 81 virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
82 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; 82 virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
83 virtual void OnFocus() OVERRIDE; 83 virtual void OnFocus() OVERRIDE;
84 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE; 84 virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
85 85
86 protected: 86 protected:
87 virtual bool NeedsNotificationWhenVisibleBoundsChange() const OVERRIDE; 87 virtual bool NeedsNotificationWhenVisibleBoundsChange() const OVERRIDE;
88 virtual void OnVisibleBoundsChanged() OVERRIDE; 88 virtual void OnVisibleBoundsChanged() OVERRIDE;
89 virtual void ViewHierarchyChanged(bool is_add, 89 virtual void ViewHierarchyChanged(bool is_add,
90 View* parent, 90 View* parent,
91 View* child) OVERRIDE; 91 View* child) OVERRIDE;
(...skipping 23 matching lines...) Expand all
115 115
116 // The view that should be given focus when this NativeViewHost is focused. 116 // The view that should be given focus when this NativeViewHost is focused.
117 View* focus_view_; 117 View* focus_view_;
118 118
119 DISALLOW_COPY_AND_ASSIGN(NativeViewHost); 119 DISALLOW_COPY_AND_ASSIGN(NativeViewHost);
120 }; 120 };
121 121
122 } // namespace views 122 } // namespace views
123 123
124 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_H_ 124 #endif // UI_VIEWS_CONTROLS_NATIVE_NATIVE_VIEW_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698