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

Side by Side Diff: ash/wm/dialog_frame_view.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 | « ash/wm/custom_frame_view_ash.cc ('k') | ash/wm/dialog_frame_view.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_DIALOG_FRAME_VIEW_H_ 5 #ifndef ASH_WM_DIALOG_FRAME_VIEW_H_
6 #define ASH_WM_DIALOG_FRAME_VIEW_H_ 6 #define ASH_WM_DIALOG_FRAME_VIEW_H_
7 7
8 #include "ui/views/controls/button/button.h" 8 #include "ui/views/controls/button/button.h"
9 #include "ui/views/window/non_client_view.h" 9 #include "ui/views/window/non_client_view.h"
10 10
(...skipping 20 matching lines...) Expand all
31 31
32 // Overridden from views::NonClientFrameView: 32 // Overridden from views::NonClientFrameView:
33 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 33 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
34 virtual gfx::Rect GetWindowBoundsForClientBounds( 34 virtual gfx::Rect GetWindowBoundsForClientBounds(
35 const gfx::Rect& client_bounds) const OVERRIDE; 35 const gfx::Rect& client_bounds) const OVERRIDE;
36 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 36 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
37 virtual void GetWindowMask(const gfx::Size& size, 37 virtual void GetWindowMask(const gfx::Size& size,
38 gfx::Path* window_mask) OVERRIDE; 38 gfx::Path* window_mask) OVERRIDE;
39 virtual void ResetWindowControls() OVERRIDE; 39 virtual void ResetWindowControls() OVERRIDE;
40 virtual void UpdateWindowIcon() OVERRIDE; 40 virtual void UpdateWindowIcon() OVERRIDE;
41 virtual void UpdateWindowTitle() OVERRIDE;
41 42
42 // Overridden from View: 43 // Overridden from View:
43 virtual std::string GetClassName() const OVERRIDE; 44 virtual std::string GetClassName() const OVERRIDE;
44 virtual void Layout() OVERRIDE; 45 virtual void Layout() OVERRIDE;
45 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 46 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
46 47
47 // Overridden from views::ButtonListener: 48 // Overridden from views::ButtonListener:
48 virtual void ButtonPressed(views::Button* sender, 49 virtual void ButtonPressed(views::Button* sender,
49 const ui::Event& event) OVERRIDE; 50 const ui::Event& event) OVERRIDE;
50 51
51 private: 52 private:
52 gfx::Insets GetPaddingInsets() const; 53 gfx::Insets GetPaddingInsets() const;
53 gfx::Insets GetClientInsets() const; 54 gfx::Insets GetClientInsets() const;
54 55
55 gfx::Rect title_display_rect_; 56 gfx::Rect title_display_rect_;
56 57
57 views::ImageButton* close_button_; 58 views::ImageButton* close_button_;
58 59
59 DISALLOW_COPY_AND_ASSIGN(DialogFrameView); 60 DISALLOW_COPY_AND_ASSIGN(DialogFrameView);
60 }; 61 };
61 62
62 } // namespace internal 63 } // namespace internal
63 } // namespace views 64 } // namespace views
64 65
65 #endif // ASH_WM_DIALOG_FRAME_VIEW_H_ 66 #endif // ASH_WM_DIALOG_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « ash/wm/custom_frame_view_ash.cc ('k') | ash/wm/dialog_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698