chrome/browser/chromeos/login/user_image_screen.h - Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location....

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/user_image_screen.h

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 9 years, 11 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 | « chrome/browser/chromeos/login/camera.cc ('k') | chrome/browser/chromeos/pulse_audio_mixer.h » ('j') | no next file with comments »

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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_

6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_	6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_

7 #pragma once	7 #pragma once

8	8

9 #include "base/thread.h"	9 #include "base/threading/thread.h"

10 #include "chrome/browser/chromeos/login/camera.h"	10 #include "chrome/browser/chromeos/login/camera.h"

11 #include "chrome/browser/chromeos/login/user_image_view.h"	11 #include "chrome/browser/chromeos/login/user_image_view.h"

12 #include "chrome/browser/chromeos/login/view_screen.h"	12 #include "chrome/browser/chromeos/login/view_screen.h"

13 #include "chrome/common/notification_observer.h"	13 #include "chrome/common/notification_observer.h"

14 #include "chrome/common/notification_registrar.h"	14 #include "chrome/common/notification_registrar.h"

15 #include "third_party/skia/include/core/SkBitmap.h"	15 #include "third_party/skia/include/core/SkBitmap.h"

16	16

17 namespace chromeos {	17 namespace chromeos {

18	18

19 class UserImageScreen: public ViewScreen<UserImageView>,	19 class UserImageScreen: public ViewScreen<UserImageView>,

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68	68

69 NotificationRegistrar registrar_;	69 NotificationRegistrar registrar_;

70	70

71 DISALLOW_COPY_AND_ASSIGN(UserImageScreen);	71 DISALLOW_COPY_AND_ASSIGN(UserImageScreen);

72 };	72 };

73	73

74 } // namespace chromeos	74 } // namespace chromeos

75	75

76 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_	76 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_IMAGE_SCREEN_H_

77	77

OLD	NEW