chrome/browser/ui/webui/options2/chromeos/user_image_source.cc - Issue 10698140: Remove "2" suffixes from options2 code.

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/ui/webui/options2/chromeos/user_image_source.cc

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 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 | « chrome/browser/ui/webui/options2/chromeos/user_image_source.h ('k') | chrome/browser/ui/webui/options2/chromeos/user_image_source2.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"	5 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source.h"

6	6

7 #include "base/memory/ref_counted_memory.h"	7 #include "base/memory/ref_counted_memory.h"

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

9 #include "base/string_split.h"	9 #include "base/string_split.h"

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

11 #include "chrome/common/url_constants.h"	11 #include "chrome/common/url_constants.h"

12 #include "googleurl/src/url_parse.h"	12 #include "googleurl/src/url_parse.h"

13 #include "grit/theme_resources.h"	13 #include "grit/theme_resources.h"

14 #include "ui/base/resource/resource_bundle.h"	14 #include "ui/base/resource/resource_bundle.h"

15 #include "ui/gfx/codec/png_codec.h"	15 #include "ui/gfx/codec/png_codec.h"

(...skipping 90 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 if (is_image_animated) {	106 if (is_image_animated) {

107 const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);	107 const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);

108 if (user && user->has_animated_image())	108 if (user && user->has_animated_image())

109 return "image/gif";	109 return "image/gif";

110 }	110 }

111 return "image/png";	111 return "image/png";

112 }	112 }

113	113

114 } // namespace options2	114 } // namespace options2

115 } // namespace chromeos	115 } // namespace chromeos

OLD	NEW