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_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
7 | 7 |
8 #include "base/gtest_prod_util.h" | 8 #include "base/gtest_prod_util.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "chrome/browser/ui/search/search_types.h" | 10 #include "chrome/browser/ui/search/search_types.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 const views::Event& event) OVERRIDE; | 63 const views::Event& event) OVERRIDE; |
64 | 64 |
65 // Overridden from chrome::TabIconViewModel: | 65 // Overridden from chrome::TabIconViewModel: |
66 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; | 66 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; |
67 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; | 67 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; |
68 | 68 |
69 // Overridden from chrome::search::ToolbarSearchAnimatorObserver: | 69 // Overridden from chrome::search::ToolbarSearchAnimatorObserver: |
70 virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE; | 70 virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE; |
71 virtual void OnToolbarBackgroundAnimatorCanceled( | 71 virtual void OnToolbarBackgroundAnimatorCanceled( |
72 TabContents* tab_contents) OVERRIDE; | 72 TabContents* tab_contents) OVERRIDE; |
| 73 virtual void OnToolbarSeparatorAnimatorProgressed() OVERRIDE; |
| 74 virtual void OnToolbarSeparatorAnimatorCanceled() OVERRIDE; |
73 | 75 |
74 private: | 76 private: |
75 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, UseShortHeader); | 77 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, UseShortHeader); |
76 | 78 |
77 // Distance between top of window and client area. | 79 // Distance between top of window and client area. |
78 int NonClientTopBorderHeight(bool force_restored) const; | 80 int NonClientTopBorderHeight(bool force_restored) const; |
79 | 81 |
80 // Returns true if we should use a short header, such as for popup windows. | 82 // Returns true if we should use a short header, such as for popup windows. |
81 bool UseShortHeader() const; | 83 bool UseShortHeader() const; |
82 | 84 |
(...skipping 25 matching lines...) Expand all Loading... |
108 scoped_ptr<ash::FramePainter> frame_painter_; | 110 scoped_ptr<ash::FramePainter> frame_painter_; |
109 | 111 |
110 // If true the |size_button_| minimizes, otherwise it toggles between | 112 // If true the |size_button_| minimizes, otherwise it toggles between |
111 // maximized and restored. | 113 // maximized and restored. |
112 bool size_button_minimizes_; | 114 bool size_button_minimizes_; |
113 | 115 |
114 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); | 116 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); |
115 }; | 117 }; |
116 | 118 |
117 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 119 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
OLD | NEW |