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

Side by Side Diff: ash/frame/custom_frame_view_ash.h

Issue 200483004: Show avatar icon on V2 app's frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « no previous file | ash/frame/custom_frame_view_ash.cc » ('j') | ash/frame/custom_frame_view_ash.cc » ('J')
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 ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 5 #ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 6 #define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/views/window/non_client_view.h" 10 #include "ui/views/window/non_client_view.h"
11 11
12 namespace ash { 12 namespace ash {
13 class FrameBorderHitTestController; 13 class FrameBorderHitTestController;
14 class HeaderPainter;
15 class ImmersiveFullscreenController; 14 class ImmersiveFullscreenController;
16 } 15 }
17 namespace views { 16 namespace views {
18 class Widget; 17 class Widget;
19 } 18 }
20 19
21 namespace ash { 20 namespace ash {
22 21
23 // A NonClientFrameView used for packaged apps, dialogs and other non-browser 22 // A NonClientFrameView used for packaged apps, dialogs and other non-browser
24 // windows. It supports immersive fullscreen. When in immersive fullscreen, the 23 // windows. It supports immersive fullscreen. When in immersive fullscreen, the
(...skipping 27 matching lines...) Expand all
52 virtual void UpdateWindowIcon() OVERRIDE; 51 virtual void UpdateWindowIcon() OVERRIDE;
53 virtual void UpdateWindowTitle() OVERRIDE; 52 virtual void UpdateWindowTitle() OVERRIDE;
54 53
55 // views::View overrides: 54 // views::View overrides:
56 virtual gfx::Size GetPreferredSize() OVERRIDE; 55 virtual gfx::Size GetPreferredSize() OVERRIDE;
57 virtual const char* GetClassName() const OVERRIDE; 56 virtual const char* GetClassName() const OVERRIDE;
58 virtual gfx::Size GetMinimumSize() OVERRIDE; 57 virtual gfx::Size GetMinimumSize() OVERRIDE;
59 virtual gfx::Size GetMaximumSize() OVERRIDE; 58 virtual gfx::Size GetMaximumSize() OVERRIDE;
60 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE; 59 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE;
61 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE; 60 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
61 virtual void VisibilityChanged(views::View* starting_from,
62 bool is_visible) OVERRIDE;
62 63
63 // Get the view of the header. 64 // Get the view of the header.
64 views::View* GetHeaderView(); 65 views::View* GetHeaderView();
65 66
67 const views::View* GetAvatarIconViewForTest() const;
68
66 private: 69 private:
67 class OverlayView; 70 class OverlayView;
68 friend class TestWidgetConstraintsDelegate; 71 friend class TestWidgetConstraintsDelegate;
69 72
70 // Height from top of window to top of client area. 73 // Height from top of window to top of client area.
71 int NonClientTopBorderHeight() const; 74 int NonClientTopBorderHeight() const;
72 75
73 // Not owned. 76 // Not owned.
74 views::Widget* frame_; 77 views::Widget* frame_;
75 78
76 // View which contains the title and window controls. 79 // View which contains the title and window controls.
77 class HeaderView; 80 class HeaderView;
78 HeaderView* header_view_; 81 HeaderView* header_view_;
79 82
80 // Updates the hittest bounds overrides based on the window state type. 83 // Updates the hittest bounds overrides based on the window state type.
81 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 84 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
82 85
83 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 86 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
84 }; 87 };
85 88
86 } // namespace ash 89 } // namespace ash
87 90
88 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_ 91 #endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
OLDNEW
« no previous file with comments | « no previous file | ash/frame/custom_frame_view_ash.cc » ('j') | ash/frame/custom_frame_view_ash.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698