OLD | NEW |
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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
7 | 7 |
8 #include "ash/shell_observer.h" | 8 #include "ash/shell_observer.h" |
9 #include "base/gtest_prod_util.h" | 9 #include "base/gtest_prod_util.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 void Init(); | 40 void Init(); |
41 | 41 |
42 // BrowserNonClientFrameView: | 42 // BrowserNonClientFrameView: |
43 gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override; | 43 gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override; |
44 int GetTopInset() const override; | 44 int GetTopInset() const override; |
45 int GetThemeBackgroundXInset() const override; | 45 int GetThemeBackgroundXInset() const override; |
46 void UpdateThrobber(bool running) override; | 46 void UpdateThrobber(bool running) override; |
47 void UpdateToolbar() override; | 47 void UpdateToolbar() override; |
48 views::View* GetLocationIconView() const override; | 48 views::View* GetLocationIconView() const override; |
| 49 void UpdateNewStyleAvatar() override; |
49 | 50 |
50 // views::NonClientFrameView: | 51 // views::NonClientFrameView: |
51 gfx::Rect GetBoundsForClientView() const override; | 52 gfx::Rect GetBoundsForClientView() const override; |
52 gfx::Rect GetWindowBoundsForClientBounds( | 53 gfx::Rect GetWindowBoundsForClientBounds( |
53 const gfx::Rect& client_bounds) const override; | 54 const gfx::Rect& client_bounds) const override; |
54 int NonClientHitTest(const gfx::Point& point) override; | 55 int NonClientHitTest(const gfx::Point& point) override; |
55 void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override; | 56 void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override; |
56 void ResetWindowControls() override; | 57 void ResetWindowControls() override; |
57 void UpdateWindowIcon() override; | 58 void UpdateWindowIcon() override; |
58 void UpdateWindowTitle() override; | 59 void UpdateWindowTitle() override; |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 scoped_ptr<ash::HeaderPainter> header_painter_; | 147 scoped_ptr<ash::HeaderPainter> header_painter_; |
147 | 148 |
148 // Updates the hittest bounds overrides based on the window show type. | 149 // Updates the hittest bounds overrides based on the window show type. |
149 scoped_ptr<ash::FrameBorderHitTestController> | 150 scoped_ptr<ash::FrameBorderHitTestController> |
150 frame_border_hit_test_controller_; | 151 frame_border_hit_test_controller_; |
151 | 152 |
152 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); | 153 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); |
153 }; | 154 }; |
154 | 155 |
155 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 156 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
OLD | NEW |