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

Side by Side Diff: ui/views/controls/throbber.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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/controls/slider.cc ('k') | ui/views/controls/tree/tree_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 #include "ui/views/controls/throbber.h" 5 #include "ui/views/controls/throbber.h"
6 6
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "grit/ui_resources.h"
9 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/canvas.h" 9 #include "ui/gfx/canvas.h"
11 #include "ui/gfx/image/image.h" 10 #include "ui/gfx/image/image.h"
12 #include "ui/gfx/image/image_skia.h" 11 #include "ui/gfx/image/image_skia.h"
12 #include "ui/resources/grit/ui_resources.h"
13 13
14 using base::Time; 14 using base::Time;
15 using base::TimeDelta; 15 using base::TimeDelta;
16 16
17 namespace views { 17 namespace views {
18 18
19 Throbber::Throbber(int frame_time_ms, 19 Throbber::Throbber(int frame_time_ms,
20 bool paint_while_stopped) 20 bool paint_while_stopped)
21 : running_(false), 21 : running_(false),
22 paint_while_stopped_(paint_while_stopped), 22 paint_while_stopped_(paint_while_stopped),
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } 159 }
160 // Otherwise we paint our tick mark or nothing depending on our state. 160 // Otherwise we paint our tick mark or nothing depending on our state.
161 if (checked_) { 161 if (checked_) {
162 int checkmark_x = (width() - checkmark_->width()) / 2; 162 int checkmark_x = (width() - checkmark_->width()) / 2;
163 int checkmark_y = (height() - checkmark_->height()) / 2; 163 int checkmark_y = (height() - checkmark_->height()) / 2;
164 canvas->DrawImageInt(*checkmark_, checkmark_x, checkmark_y); 164 canvas->DrawImageInt(*checkmark_, checkmark_x, checkmark_y);
165 } 165 }
166 } 166 }
167 167
168 } // namespace views 168 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/slider.cc ('k') | ui/views/controls/tree/tree_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698