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

Side by Side Diff: ui/views/window/non_client_view.cc

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 | « ui/views/window/non_client_view.h ('k') | no next file » | 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 #include "ui/views/window/non_client_view.h" 5 #include "ui/views/window/non_client_view.h"
6 6
7 #include "ui/base/accessibility/accessible_view_state.h" 7 #include "ui/base/accessibility/accessible_view_state.h"
8 #include "ui/base/hit_test.h" 8 #include "ui/base/hit_test.h"
9 #include "ui/views/widget/root_view.h" 9 #include "ui/views/widget/root_view.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 } 89 }
90 90
91 void NonClientView::ResetWindowControls() { 91 void NonClientView::ResetWindowControls() {
92 frame_view_->ResetWindowControls(); 92 frame_view_->ResetWindowControls();
93 } 93 }
94 94
95 void NonClientView::UpdateWindowIcon() { 95 void NonClientView::UpdateWindowIcon() {
96 frame_view_->UpdateWindowIcon(); 96 frame_view_->UpdateWindowIcon();
97 } 97 }
98 98
99 void NonClientView::UpdateWindowTitle() {
100 frame_view_->UpdateWindowTitle();
101 }
102
99 void NonClientView::LayoutFrameView() { 103 void NonClientView::LayoutFrameView() {
100 // First layout the NonClientFrameView, which determines the size of the 104 // First layout the NonClientFrameView, which determines the size of the
101 // ClientView... 105 // ClientView...
102 frame_view_->SetBounds(0, 0, width(), height()); 106 frame_view_->SetBounds(0, 0, width(), height());
103 107
104 // We need to manually call Layout here because layout for the frame view can 108 // We need to manually call Layout here because layout for the frame view can
105 // change independently of the bounds changing - e.g. after the initial 109 // change independently of the bounds changing - e.g. after the initial
106 // display of the window the metrics of the native window controls can change, 110 // display of the window the metrics of the native window controls can change,
107 // which does not change the bounds of the window but requires a re-layout to 111 // which does not change the bounds of the window but requires a re-layout to
108 // trigger a repaint. We override OnBoundsChanged() for the NonClientFrameView 112 // trigger a repaint. We override OnBoundsChanged() for the NonClientFrameView
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 std::string NonClientFrameView::GetClassName() const { 277 std::string NonClientFrameView::GetClassName() const {
274 return kViewClassName; 278 return kViewClassName;
275 } 279 }
276 280
277 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) { 281 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
278 // Overridden to do nothing. The NonClientView manually calls Layout on the 282 // Overridden to do nothing. The NonClientView manually calls Layout on the
279 // FrameView when it is itself laid out, see comment in NonClientView::Layout. 283 // FrameView when it is itself laid out, see comment in NonClientView::Layout.
280 } 284 }
281 285
282 } // namespace views 286 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/window/non_client_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698