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

Side by Side Diff: chrome/browser/ui/views/panels/panel_view.h

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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_PANELS_PANEL_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/ui/panels/native_panel.h" 9 #include "chrome/browser/ui/panels/native_panel.h"
10 #include "ui/gfx/animation/animation_delegate.h" 10 #include "ui/gfx/animation/animation_delegate.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // Overridden from AnimationDelegate: 160 // Overridden from AnimationDelegate:
161 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 161 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
162 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 162 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
163 163
164 void UpdateLoadingAnimations(bool should_animate); 164 void UpdateLoadingAnimations(bool should_animate);
165 void UpdateWindowTitle(); 165 void UpdateWindowTitle();
166 void UpdateWindowIcon(); 166 void UpdateWindowIcon();
167 void SetBoundsInternal(const gfx::Rect& bounds, bool animate); 167 void SetBoundsInternal(const gfx::Rect& bounds, bool animate);
168 bool EndDragging(bool cancelled); 168 bool EndDragging(bool cancelled);
169 void OnViewWasResized();
170 169
171 // Sets the bounds of the underlying window to |new_bounds|. Note that this 170 // Sets the bounds of the underlying window to |new_bounds|. Note that this
172 // might update the window style to work around the minimum overlapped 171 // might update the window style to work around the minimum overlapped
173 // window height limitation. 172 // window height limitation.
174 void SetWidgetBounds(const gfx::Rect& new_bounds); 173 void SetWidgetBounds(const gfx::Rect& new_bounds);
175 174
176 #if defined(OS_WIN) 175 #if defined(OS_WIN)
177 // Sets |attribute_value_to_set| and/or clears |attribute_value_to_reset| for 176 // Sets |attribute_value_to_set| and/or clears |attribute_value_to_reset| for
178 // the attibute denoted by |attribute_index|. This is used to update the style 177 // the attibute denoted by |attribute_index|. This is used to update the style
179 // or extended style for the native window. 178 // or extended style for the native window.
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 247
249 #if defined(OS_WIN) 248 #if defined(OS_WIN)
250 // Used to provide custom taskbar thumbnail for Windows 7 and later. 249 // Used to provide custom taskbar thumbnail for Windows 7 and later.
251 scoped_ptr<TaskbarWindowThumbnailerWin> thumbnailer_; 250 scoped_ptr<TaskbarWindowThumbnailerWin> thumbnailer_;
252 #endif 251 #endif
253 252
254 DISALLOW_COPY_AND_ASSIGN(PanelView); 253 DISALLOW_COPY_AND_ASSIGN(PanelView);
255 }; 254 };
256 255
257 #endif // CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_ 256 #endif // CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698