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: ash/wm/custom_frame_view_ash.h

Issue 10993087: Handle titlebar text updates properly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Odd - build machine failed to update patch (which I updated successfully) Re-uploading Created 8 years, 2 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/wm/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_WM_CUSTOM_FRAME_VIEW_ASH_H_ 5 #ifndef ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
6 #define ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 6 #define ASH_WM_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/controls/button/button.h" // ButtonListener 10 #include "ui/views/controls/button/button.h" // ButtonListener
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 // views::NonClientFrameView overrides: 57 // views::NonClientFrameView overrides:
58 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 58 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
59 virtual gfx::Rect GetWindowBoundsForClientBounds( 59 virtual gfx::Rect GetWindowBoundsForClientBounds(
60 const gfx::Rect& client_bounds) const OVERRIDE; 60 const gfx::Rect& client_bounds) const OVERRIDE;
61 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 61 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
62 virtual void GetWindowMask(const gfx::Size& size, 62 virtual void GetWindowMask(const gfx::Size& size,
63 gfx::Path* window_mask) OVERRIDE; 63 gfx::Path* window_mask) OVERRIDE;
64 virtual void ResetWindowControls() OVERRIDE; 64 virtual void ResetWindowControls() OVERRIDE;
65 virtual void UpdateWindowIcon() OVERRIDE; 65 virtual void UpdateWindowIcon() OVERRIDE;
66 virtual void UpdateWindowTitle() OVERRIDE;
66 67
67 // views::View overrides: 68 // views::View overrides:
68 virtual gfx::Size GetPreferredSize() OVERRIDE; 69 virtual gfx::Size GetPreferredSize() OVERRIDE;
69 virtual void Layout() OVERRIDE; 70 virtual void Layout() OVERRIDE;
70 virtual std::string GetClassName() const OVERRIDE; 71 virtual std::string GetClassName() const OVERRIDE;
71 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 72 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
72 virtual gfx::Size GetMinimumSize() OVERRIDE; 73 virtual gfx::Size GetMinimumSize() OVERRIDE;
73 74
74 // views::ButtonListener overrides: 75 // views::ButtonListener overrides:
75 virtual void ButtonPressed(views::Button* sender, 76 virtual void ButtonPressed(views::Button* sender,
(...skipping 11 matching lines...) Expand all
87 views::ImageButton* window_icon_; 88 views::ImageButton* window_icon_;
88 89
89 scoped_ptr<FramePainter> frame_painter_; 90 scoped_ptr<FramePainter> frame_painter_;
90 91
91 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh); 92 DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAsh);
92 }; 93 };
93 94
94 } // namespace ash 95 } // namespace ash
95 96
96 #endif // ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_ 97 #endif // ASH_WM_CUSTOM_FRAME_VIEW_ASH_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/custom_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698