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

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: rebase 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') | 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 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"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 virtual void UpdateWindowIcon() OVERRIDE; 51 virtual void UpdateWindowIcon() OVERRIDE;
52 virtual void UpdateWindowTitle() OVERRIDE; 52 virtual void UpdateWindowTitle() OVERRIDE;
53 53
54 // views::View overrides: 54 // views::View overrides:
55 virtual gfx::Size GetPreferredSize() OVERRIDE; 55 virtual gfx::Size GetPreferredSize() OVERRIDE;
56 virtual const char* GetClassName() const OVERRIDE; 56 virtual const char* GetClassName() const OVERRIDE;
57 virtual gfx::Size GetMinimumSize() OVERRIDE; 57 virtual gfx::Size GetMinimumSize() OVERRIDE;
58 virtual gfx::Size GetMaximumSize() OVERRIDE; 58 virtual gfx::Size GetMaximumSize() OVERRIDE;
59 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE; 59 virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE;
60 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;
61 63
62 // Get the view of the header. 64 // Get the view of the header.
63 views::View* GetHeaderView(); 65 views::View* GetHeaderView();
64 66
67 const views::View* GetAvatarIconViewForTest() const;
68
65 private: 69 private:
66 class OverlayView; 70 class OverlayView;
67 friend class TestWidgetConstraintsDelegate; 71 friend class TestWidgetConstraintsDelegate;
68 72
69 // Height from top of window to top of client area. 73 // Height from top of window to top of client area.
70 int NonClientTopBorderHeight() const; 74 int NonClientTopBorderHeight() const;
71 75
72 // Not owned. 76 // Not owned.
73 views::Widget* frame_; 77 views::Widget* frame_;
74 78
75 // View which contains the title and window controls. 79 // View which contains the title and window controls.
76 class HeaderView; 80 class HeaderView;
77 HeaderView* header_view_; 81 HeaderView* header_view_;
78 82
79 // Updates the hittest bounds overrides based on the window state type. 83 // Updates the hittest bounds overrides based on the window state type.
80 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 84 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_;
81 85
82 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 86 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
83 }; 87 };
84 88
85 } // namespace ash 89 } // namespace ash
86 90
87 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698