|
|
Revert r139779 "Added support for animated/nonanimated user image. There are no"
Conflicts:
chrome/browser/chromeos/login/user.cc
chrome/browser/chromeos/login/user.h
chrome/browser/chromeos/login/user_image.cc
chrome/browser/chromeos/login/user_image.h
Conflicts to user.[cc|h] caused by SkBitmap->ImageSkia conversion (r139802) so were manually fixed. "Conflicts" in user_image.[cc|h] are git noise since files were added in original CL.
BUG= 130597
TEST=browser_tests gtest_filter="GuestModeOptionsBrowserTest.LoadOptionsByURL"
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=139912
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+77 lines, -288 lines) |
Patch |
 |
M |
chrome/browser/automation/automation_provider_observers_chromeos.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/mock_user_manager.h
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user.h
|
View
|
|
4 chunks |
+3 lines, -8 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user.cc
|
View
|
|
3 chunks |
+5 lines, -13 lines |
0 comments
|
Download
|
|
D |
chrome/browser/chromeos/login/user_image.h
|
View
|
|
1 chunk |
+0 lines, -50 lines |
0 comments
|
Download
|
|
D |
chrome/browser/chromeos/login/user_image.cc
|
View
|
|
1 chunk |
+0 lines, -48 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_image_loader.h
|
View
|
|
3 chunks |
+4 lines, -8 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_image_loader.cc
|
View
|
|
5 chunks |
+4 lines, -16 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_image_screen.cc
|
View
|
|
2 chunks |
+1 line, -3 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_manager.h
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_manager_impl.h
|
View
|
|
7 chunks |
+8 lines, -9 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_manager_impl.cc
|
View
|
|
19 chunks |
+30 lines, -39 lines |
0 comments
|
Download
|
|
M |
chrome/browser/image_decoder.h
|
View
|
|
2 chunks |
+1 line, -5 lines |
0 comments
|
Download
|
|
M |
chrome/browser/image_decoder.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/resources/chromeos/login/user_pod_row.js
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/resources/options2/chromeos/change_picture_options.js
|
View
|
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc
|
View
|
|
3 chunks |
+2 lines, -5 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/webui/options2/chromeos/user_image_source2.h
|
View
|
|
2 chunks |
+5 lines, -7 lines |
0 comments
|
Download
|
|
M |
chrome/browser/ui/webui/options2/chromeos/user_image_source2.cc
|
View
|
|
2 chunks |
+7 lines, -66 lines |
0 comments
|
Download
|
|
M |
chrome/chrome_browser.gypi
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
Total messages: 4 (0 generated)
|
Chromium Code Reviews
Issue
10448105:
Revert "Added support for animated/nonanimated user image. There are no" (Closed)
