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

Side by Side Diff: ash/accelerators/exit_warning_handler.cc

Issue 23228004: Prepare to use gfx::RenderText in views::Label. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert Label implementation changes. Created 6 years, 5 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/sticky_keys/sticky_keys_overlay.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/accelerators/exit_warning_handler.h" 5 #include "ash/accelerators/exit_warning_handler.h"
6 6
7 #include "ash/metrics/user_metrics_recorder.h" 7 #include "ash/metrics/user_metrics_recorder.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 text_width_ = gfx::GetStringWidth(text_, font_list); 56 text_width_ = gfx::GetStringWidth(text_, font_list);
57 width_ = text_width_ + kHorizontalMarginAroundText; 57 width_ = text_width_ + kHorizontalMarginAroundText;
58 height_ = font_list.GetHeight() + kVerticalMarginAroundText; 58 height_ = font_list.GetHeight() + kVerticalMarginAroundText;
59 views::Label* label = new views::Label(); 59 views::Label* label = new views::Label();
60 label->SetText(text_); 60 label->SetText(text_);
61 label->SetHorizontalAlignment(gfx::ALIGN_CENTER); 61 label->SetHorizontalAlignment(gfx::ALIGN_CENTER);
62 label->SetFontList(font_list); 62 label->SetFontList(font_list);
63 label->SetEnabledColor(kTextColor); 63 label->SetEnabledColor(kTextColor);
64 label->SetDisabledColor(kTextColor); 64 label->SetDisabledColor(kTextColor);
65 label->SetAutoColorReadabilityEnabled(false); 65 label->SetAutoColorReadabilityEnabled(false);
66 label->set_subpixel_rendering_enabled(false); 66 label->SetSubpixelRenderingEnabled(false);
67 AddChildView(label); 67 AddChildView(label);
68 SetLayoutManager(new views::FillLayout); 68 SetLayoutManager(new views::FillLayout);
69 } 69 }
70 70
71 virtual gfx::Size GetPreferredSize() const OVERRIDE { 71 virtual gfx::Size GetPreferredSize() const OVERRIDE {
72 return gfx::Size(width_, height_); 72 return gfx::Size(width_, height_);
73 } 73 }
74 74
75 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 75 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
76 SkPaint paint; 76 SkPaint paint;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 widget_->Show(); 180 widget_->Show();
181 181
182 delegate->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); 182 delegate->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
183 } 183 }
184 184
185 void ExitWarningHandler::Hide() { 185 void ExitWarningHandler::Hide() {
186 widget_.reset(); 186 widget_.reset();
187 } 187 }
188 188
189 } // namespace ash 189 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/sticky_keys/sticky_keys_overlay.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698