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

Side by Side Diff: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h

Issue 10816027: alternate ntp: toolbar background and separator animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 5 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 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 const views::Event& event) OVERRIDE; 64 const views::Event& event) OVERRIDE;
65 65
66 // Overridden from chrome::TabIconViewModel: 66 // Overridden from chrome::TabIconViewModel:
67 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; 67 virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
68 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; 68 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
69 69
70 // Overridden from chrome::search::ToolbarSearchAnimatorObserver: 70 // Overridden from chrome::search::ToolbarSearchAnimatorObserver:
71 virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE; 71 virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE;
72 virtual void OnToolbarBackgroundAnimatorCanceled( 72 virtual void OnToolbarBackgroundAnimatorCanceled(
73 TabContents* tab_contents) OVERRIDE; 73 TabContents* tab_contents) OVERRIDE;
74 virtual void OnToolbarSeparatorAnimatorProgressed() OVERRIDE;
75 virtual void OnToolbarSeparatorAnimatorCanceled() OVERRIDE;
74 76
75 private: 77 private:
76 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, UseShortHeader); 78 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, UseShortHeader);
77 79
78 // Distance between top of window and client area. 80 // Distance between top of window and client area.
79 int NonClientTopBorderHeight(bool force_restored) const; 81 int NonClientTopBorderHeight(bool force_restored) const;
80 82
81 // Returns true if we should use a short header, such as for popup windows. 83 // Returns true if we should use a short header, such as for popup windows.
82 bool UseShortHeader() const; 84 bool UseShortHeader() const;
83 85
(...skipping 25 matching lines...) Expand all
109 scoped_ptr<ash::FramePainter> frame_painter_; 111 scoped_ptr<ash::FramePainter> frame_painter_;
110 112
111 // If true the |size_button_| minimizes, otherwise it toggles between 113 // If true the |size_button_| minimizes, otherwise it toggles between
112 // maximized and restored. 114 // maximized and restored.
113 bool size_button_minimizes_; 115 bool size_button_minimizes_;
114 116
115 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 117 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
116 }; 118 };
117 119
118 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 120 #endif // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698