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

Side by Side Diff: ui/views/widget/native_widget_win.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 two win 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
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_win.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) 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 UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <atlbase.h> 9 #include <atlbase.h>
10 #include <atlapp.h> 10 #include <atlapp.h>
(...skipping 14 matching lines...) Expand all
25 #include "ui/views/focus/focus_manager.h" 25 #include "ui/views/focus/focus_manager.h"
26 #include "ui/views/layout/layout_manager.h" 26 #include "ui/views/layout/layout_manager.h"
27 #include "ui/views/widget/native_widget_private.h" 27 #include "ui/views/widget/native_widget_private.h"
28 28
29 namespace ui { 29 namespace ui {
30 class Compositor; 30 class Compositor;
31 class ViewProp; 31 class ViewProp;
32 } 32 }
33 33
34 namespace gfx { 34 namespace gfx {
35 class CanvasSkia; 35 class Canvas;
36 class Font; 36 class Font;
37 class Rect; 37 class Rect;
38 } 38 }
39 39
40 namespace views { 40 namespace views {
41 41
42 class DropTargetWin; 42 class DropTargetWin;
43 class RootView; 43 class RootView;
44 class TooltipManagerWin; 44 class TooltipManagerWin;
45 45
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 // most likely want to set this to false, or after changing the alpha toggle 543 // most likely want to set this to false, or after changing the alpha toggle
544 // the extended style bit to false than back to true. See MSDN for more 544 // the extended style bit to false than back to true. See MSDN for more
545 // details. 545 // details.
546 bool use_layered_buffer_; 546 bool use_layered_buffer_;
547 547
548 // The default alpha to be applied to the layered window. 548 // The default alpha to be applied to the layered window.
549 BYTE layered_alpha_; 549 BYTE layered_alpha_;
550 550
551 // A canvas that contains the window contents in the case of a layered 551 // A canvas that contains the window contents in the case of a layered
552 // window. 552 // window.
553 scoped_ptr<gfx::CanvasSkia> layered_window_contents_; 553 scoped_ptr<gfx::Canvas> layered_window_contents_;
554 554
555 // We must track the invalid rect ourselves, for two reasons: 555 // We must track the invalid rect ourselves, for two reasons:
556 // For layered windows, Windows will not do this properly with 556 // For layered windows, Windows will not do this properly with
557 // InvalidateRect()/GetUpdateRect(). (In fact, it'll return misleading 557 // InvalidateRect()/GetUpdateRect(). (In fact, it'll return misleading
558 // information from GetUpdateRect()). 558 // information from GetUpdateRect()).
559 // We also need to keep track of the invalid rectangle for the RootView should 559 // We also need to keep track of the invalid rectangle for the RootView should
560 // we need to paint the non-client area. The data supplied to WM_NCPAINT seems 560 // we need to paint the non-client area. The data supplied to WM_NCPAINT seems
561 // to be insufficient. 561 // to be insufficient.
562 gfx::Rect invalid_rect_; 562 gfx::Rect invalid_rect_;
563 563
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 bool has_non_client_view_; 648 bool has_non_client_view_;
649 649
650 bool remove_standard_frame_; 650 bool remove_standard_frame_;
651 651
652 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin); 652 DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
653 }; 653 };
654 654
655 } // namespace views 655 } // namespace views
656 656
657 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_ 657 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
OLDNEW
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/widget/native_widget_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698