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

Side by Side Diff: ash/wm/dialog_frame_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 | « ash/wm/dialog_frame_view.h ('k') | ash/wm/frame_painter.h » ('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 #include "ash/wm/dialog_frame_view.h" 5 #include "ash/wm/dialog_frame_view.h"
6 6
7 #include "grit/ui_resources.h" 7 #include "grit/ui_resources.h"
8 #include "ui/base/hit_test.h" 8 #include "ui/base/hit_test.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 } 113 }
114 114
115 void DialogFrameView::ResetWindowControls() { 115 void DialogFrameView::ResetWindowControls() {
116 // Nothing to do. 116 // Nothing to do.
117 } 117 }
118 118
119 void DialogFrameView::UpdateWindowIcon() { 119 void DialogFrameView::UpdateWindowIcon() {
120 // Nothing to do. 120 // Nothing to do.
121 } 121 }
122 122
123 void DialogFrameView::UpdateWindowTitle() {
124 // Nothing to do.
125 }
126
123 //////////////////////////////////////////////////////////////////////////////// 127 ////////////////////////////////////////////////////////////////////////////////
124 // DialogFrameView, views::View overrides: 128 // DialogFrameView, views::View overrides:
125 129
126 std::string DialogFrameView::GetClassName() const { 130 std::string DialogFrameView::GetClassName() const {
127 return kViewClassName; 131 return kViewClassName;
128 } 132 }
129 133
130 void DialogFrameView::Layout() { 134 void DialogFrameView::Layout() {
131 title_display_rect_ = GetLocalBounds(); 135 title_display_rect_ = GetLocalBounds();
132 title_display_rect_.Inset(GetPaddingInsets()); 136 title_display_rect_.Inset(GetPaddingInsets());
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 GetTitleFont().GetHeight() + GetTitleFont().GetFontSize() - 190 GetTitleFont().GetHeight() + GetTitleFont().GetFontSize() -
187 kDialogTopPaddingNudge, 191 kDialogTopPaddingNudge,
188 -kDialogHPaddingNudge, 192 -kDialogHPaddingNudge,
189 -kDialogBottomPaddingNudge, 193 -kDialogBottomPaddingNudge,
190 -kDialogHPaddingNudge); 194 -kDialogHPaddingNudge);
191 return insets; 195 return insets;
192 } 196 }
193 197
194 } // namespace internal 198 } // namespace internal
195 } // namespace views 199 } // namespace views
OLDNEW
« no previous file with comments | « ash/wm/dialog_frame_view.h ('k') | ash/wm/frame_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698