chrome/browser/chromeos/login/oobe_progress_bar.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/oobe_progress_bar.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "chrome/browser/chromeos/login/oobe_progress_bar.h"	5 #include "chrome/browser/chromeos/login/oobe_progress_bar.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "gfx/canvas_skia.h"

10 #include "grit/theme_resources.h"	9 #include "grit/theme_resources.h"

11 #include "third_party/skia/include/core/SkBitmap.h"	10 #include "third_party/skia/include/core/SkBitmap.h"

12 #include "ui/base/l10n/l10n_util.h"	11 #include "ui/base/l10n/l10n_util.h"

13 #include "ui/base/resource/resource_bundle.h"	12 #include "ui/base/resource/resource_bundle.h"

	13 #include "ui/gfx/canvas_skia.h"

14	14

15 namespace chromeos {	15 namespace chromeos {

16	16

17 // static	17 // static

18 SkBitmap* OobeProgressBar::dot_current_ = NULL;	18 SkBitmap* OobeProgressBar::dot_current_ = NULL;

19 SkBitmap* OobeProgressBar::dot_empty_ = NULL;	19 SkBitmap* OobeProgressBar::dot_empty_ = NULL;

20 SkBitmap* OobeProgressBar::dot_filled_ = NULL;	20 SkBitmap* OobeProgressBar::dot_filled_ = NULL;

21 SkBitmap* OobeProgressBar::line_ = NULL;	21 SkBitmap* OobeProgressBar::line_ = NULL;

22 SkBitmap* OobeProgressBar::line_left_ = NULL;	22 SkBitmap* OobeProgressBar::line_left_ = NULL;

23 SkBitmap* OobeProgressBar::line_right_ = NULL;	23 SkBitmap* OobeProgressBar::line_right_ = NULL;

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
132 if (steps_[i] == step) {	132 if (steps_[i] == step) {

133 progress_ = i;	133 progress_ = i;

134 SchedulePaint();	134 SchedulePaint();

135 return;	135 return;

136 }	136 }

137 }	137 }

138 NOTREACHED();	138 NOTREACHED();

139 }	139 }

140	140

141 } // namespace chromeos	141 } // namespace chromeos

OLD	NEW

« no previous file with comments | « chrome/browser/chromeos/login/oobe_progress_bar.h ('k') | chrome/browser/chromeos/login/proxy_settings_dialog.h » ('j') | no next file with comments »