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

Side by Side Diff: ash/shell/panel_window.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_SHELL_PANEL_WINDOW_H_ 5 #ifndef ASH_SHELL_PANEL_WINDOW_H_
6 #define ASH_SHELL_PANEL_WINDOW_H_ 6 #define ASH_SHELL_PANEL_WINDOW_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "ui/aura/aura_export.h" 10 #include "ui/aura/aura_export.h"
(...skipping 15 matching lines...) Expand all
26 26
27 const std::string& name() { return name_; } 27 const std::string& name() { return name_; }
28 views::Widget::InitParams& params() { return params_; } 28 views::Widget::InitParams& params() { return params_; }
29 29
30 // Creates a panel window and returns the associated widget. 30 // Creates a panel window and returns the associated widget.
31 static views::Widget* CreatePanelWindow(const gfx::Rect& rect); 31 static views::Widget* CreatePanelWindow(const gfx::Rect& rect);
32 32
33 private: 33 private:
34 // Overridden from views::View: 34 // Overridden from views::View:
35 virtual gfx::Size GetPreferredSize() OVERRIDE; 35 virtual gfx::Size GetPreferredSize() OVERRIDE;
36 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 36 virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
37 37
38 // Overridden from views::WidgetDelegate: 38 // Overridden from views::WidgetDelegate:
39 virtual string16 GetWindowTitle() const OVERRIDE; 39 virtual string16 GetWindowTitle() const OVERRIDE;
40 virtual View* GetContentsView() OVERRIDE; 40 virtual View* GetContentsView() OVERRIDE;
41 virtual bool CanResize() const OVERRIDE; 41 virtual bool CanResize() const OVERRIDE;
42 virtual bool CanMaximize() const OVERRIDE; 42 virtual bool CanMaximize() const OVERRIDE;
43 virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE; 43 virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
44 44
45 std::string name_; 45 std::string name_;
46 views::Widget::InitParams params_; 46 views::Widget::InitParams params_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(PanelWindow); 48 DISALLOW_COPY_AND_ASSIGN(PanelWindow);
49 }; 49 };
50 50
51 } // namespace ash 51 } // namespace ash
52 52
53 #endif // ASH_SHELL_PANEL_WINDOW_H_ 53 #endif // ASH_SHELL_PANEL_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698