Replace the index mapping of wallpaper picker UI and hard coded wallpaper index in C++

Replace the index mapping of wallpaper picker UI and hard coded wallpaper index in C++


In this CL, we replace the old index system with a smarter one.
Its basically the same index system used for default user profile images.


BUG=124035
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=133602

[bshe, 2012-04-18 19:01:56]

Hi Rob.

Could you please take a look at this CL? Thanks!

[flackr, 2012-04-18 20:16:34]

We should consider whether it would be better to save a string wallpaper
preference. This might become necessary to support features like web wallpapers
and such.

Also, I would prefer if you used the singular Wallpaper for the source name:
i.e. chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.cc

http://codereview.chromium.org/10021066/diff/1001/chrome/browser/resources/op...
File chrome/browser/resources/options2/chromeos/set_wallpaper_options.js
(right):

http://codereview.chromium.org/10021066/diff/1001/chrome/browser/resources/op...
chrome/browser/resources/options2/chromeos/set_wallpaper_options.js:93:
$('author-website').innerText = '';
Can you use textContent instead of innerText?

http://codereview.chromium.org/10021066/diff/1001/chrome/browser/resources/op...
chrome/browser/resources/options2/chromeos/set_wallpaper_options.js:122: *
@param {string} url url of the wallpaper thumbnail to select.
I believe in the comment parts you should capitalize URL. The variable name
stays lowercase though.

http://codereview.chromium.org/10021066/diff/1001/chrome/browser/ui/webui/opt...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc
(right):

http://codereview.chromium.org/10021066/diff/1001/chrome/browser/ui/webui/opt...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:35: if
(base::StringToInt(base::StringPiece(path.begin() +
Should be able to use
if (base::StringToInt(path.substr(strlen(kDefaultWallpaperPrefix))))

http://codereview.chromium.org/10021066/diff/1001/chrome/browser/ui/webui/opt...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:48:
bool IsDefaultWallpaperURL(const std::string url, int* wallpaper_index) {
This seems very similar to the above method with slightly different inputs. You
should be able to at least factor out the getting the default wallpaper index
(if it is a default wallpaper) part.

http://codereview.chromium.org/10021066/diff/1001/chrome/browser/ui/webui/opt...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:56: if
(base::StringToInt(base::StringPiece(url.begin() + prefix.length(),
You should be able to use:
if (base::StringToInt(url.substr(prefix.length()))

[bshe, 2012-04-19 00:15:57]

Done. Thanks!

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/reso...
File chrome/browser/resources/options2/chromeos/set_wallpaper_options.js
(right):

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/reso...
chrome/browser/resources/options2/chromeos/set_wallpaper_options.js:93:
$('author-website').innerText = '';
On 2012/04/18 20:16:34, flackr wrote:
> Can you use textContent instead of innerText?

Done.

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/reso...
chrome/browser/resources/options2/chromeos/set_wallpaper_options.js:122: *
@param {string} url url of the wallpaper thumbnail to select.
On 2012/04/18 20:16:34, flackr wrote:
> I believe in the comment parts you should capitalize URL. The variable name
> stays lowercase though.

Done.

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/ui/w...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc
(right):

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/ui/w...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:35: if
(base::StringToInt(base::StringPiece(path.begin() +
It seems base::StringToInt only takes base::StringPiece argument type. So the
substr still need to implicitly convert to StringPiece anyway. And it seems
there are lots of places in the codebase use StringPiece this way. So probably
keep it this way also fine? Happy to change it if you dont think so.

On 2012/04/18 20:16:34, flackr wrote:
> Should be able to use
> if (base::StringToInt(path.substr(strlen(kDefaultWallpaperPrefix))))

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/ui/w...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:48:
bool IsDefaultWallpaperURL(const std::string url, int* wallpaper_index) {
Good point.

On 2012/04/18 20:16:34, flackr wrote:
> This seems very similar to the above method with slightly different inputs.
You
> should be able to at least factor out the getting the default wallpaper index
> (if it is a default wallpaper) part.

[flackr, 2012-04-19 20:13:07]

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/ui/w...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc
(right):

https://chromiumcodereview.appspot.com/10021066/diff/1001/chrome/browser/ui/w...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:35: if
(base::StringToInt(base::StringPiece(path.begin() +
If this is an established pattern that's okay. It may be done for efficiency
purposes (i.e. a slice of the original rather than constructing a new string).

On 2012/04/19 00:15:57, bshe wrote:
> It seems base::StringToInt only takes base::StringPiece argument type. So the
> substr still need to implicitly convert to StringPiece anyway. And it seems
> there are lots of places in the codebase use StringPiece this way. So probably
> keep it this way also fine? Happy to change it if you dont think so.
> 
> On 2012/04/18 20:16:34, flackr wrote:
> > Should be able to use
> > if (base::StringToInt(path.substr(strlen(kDefaultWallpaperPrefix))))
>

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc
(right):

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:58:
std::string sub_path = url.substr(strlen(
I'm fairly certain StringPiece avoids constructing new strings, in which case we
should use it. Make ParseIndexFromPath take a StringPiece :-).

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/common/url_c...
File chrome/common/url_constants.cc (right):

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/common/url_c...
chrome/common/url_constants.cc:98: const char kChromeUIWallpaperThumbnailURL[] =
"chrome://wallpapers/";
s/wallpapers/wallpaper

https://chromiumcodereview.appspot.com/10021066/diff/10001/chrome/browser/res...
File chrome/browser/resources/options2/chromeos/set_wallpaper_options.js
(right):

https://chromiumcodereview.appspot.com/10021066/diff/10001/chrome/browser/res...
chrome/browser/resources/options2/chromeos/set_wallpaper_options.js:121: *
Selects corresponding wallpaper thumbnail with the given url.
Here too

[bshe, 2012-04-19 21:05:25]

Thanks!

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc
(right):

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:58:
std::string sub_path = url.substr(strlen(
On 2012/04/19 20:13:07, flackr wrote:
> I'm fairly certain StringPiece avoids constructing new strings, in which case
we
> should use it. Make ParseIndexFromPath take a StringPiece :-).

It seems the StartsWithASCII function use std:string arguments. So I need to
either somehow convert the StringPiece to string (this way would be no
difference in terms of efficiency) or wrote similar function as StartsWithASCII
but use StringPiece as arguments. Or maybe just leave it this way since
constructing one string is cheap. Which one do you prefer?

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/common/url_c...
File chrome/common/url_constants.cc (right):

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/common/url_c...
chrome/common/url_constants.cc:98: const char kChromeUIWallpaperThumbnailURL[] =
"chrome://wallpapers/";
Done. Sorry I missed it...

On 2012/04/19 20:13:07, flackr wrote:
> s/wallpapers/wallpaper

https://chromiumcodereview.appspot.com/10021066/diff/10001/chrome/browser/res...
File chrome/browser/resources/options2/chromeos/set_wallpaper_options.js
(right):

https://chromiumcodereview.appspot.com/10021066/diff/10001/chrome/browser/res...
chrome/browser/resources/options2/chromeos/set_wallpaper_options.js:121: *
Selects corresponding wallpaper thumbnail with the given url.
On 2012/04/19 20:13:07, flackr wrote:
> Here too

Done.

[flackr, 2012-04-20 00:16:50]

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc
(right):

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:58:
std::string sub_path = url.substr(strlen(
On 2012/04/19 21:05:25, bshe wrote:
> On 2012/04/19 20:13:07, flackr wrote:
> > I'm fairly certain StringPiece avoids constructing new strings, in which
case
> we
> > should use it. Make ParseIndexFromPath take a StringPiece :-).
> 
> It seems the StartsWithASCII function use std:string arguments. So I need to
> either somehow convert the StringPiece to string (this way would be no
> difference in terms of efficiency) or wrote similar function as
StartsWithASCII
> but use StringPiece as arguments. Or maybe just leave it this way since
> constructing one string is cheap. Which one do you prefer?

bool BasicStringPiece::starts_with should work :).

[bshe, 2012-04-20 15:33:00]

Thanks

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc
(right):

https://chromiumcodereview.appspot.com/10021066/diff/4003/chrome/browser/ui/w...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnails_source2.cc:58:
std::string sub_path = url.substr(strlen(
As discussed, StartsWithASCII does a case insensitive check, so probably want to
just construct a sub str here.  

On 2012/04/20 00:16:50, flackr wrote:
> On 2012/04/19 21:05:25, bshe wrote:
> > On 2012/04/19 20:13:07, flackr wrote:
> > > I'm fairly certain StringPiece avoids constructing new strings, in which
> case
> > we
> > > should use it. Make ParseIndexFromPath take a StringPiece :-).
> > 
> > It seems the StartsWithASCII function use std:string arguments. So I need to
> > either somehow convert the StringPiece to string (this way would be no
> > difference in terms of efficiency) or wrote similar function as
> StartsWithASCII
> > but use StringPiece as arguments. Or maybe just leave it this way since
> > constructing one string is cheap. Which one do you prefer?
> 
> bool BasicStringPiece::starts_with should work :).

[flackr, 2012-04-20 16:58:18]

lgtm with nits

http://codereview.chromium.org/10021066/diff/21001/ash/desktop_background/des...
File ash/desktop_background/desktop_background_resources.cc (right):

http://codereview.chromium.org/10021066/diff/21001/ash/desktop_background/des...
ash/desktop_background/desktop_background_resources.cc:226: // -1 reserved for
random wallpaper and -2 for customized wallpaper.
Are these in use yet? If so can you add constants for random and customized too.

http://codereview.chromium.org/10021066/diff/21001/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h
(right):

http://codereview.chromium.org/10021066/diff/21001/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h:27: // A
DataSource for chrome://wallpapers/ URLs.
s/wallpapers/wallpaper (all instances)

http://codereview.chromium.org/10021066/diff/21001/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/options_ui2.cc (right):

http://codereview.chromium.org/10021066/diff/21001/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/options_ui2.cc:313: // Set up the
chrome://wallpapers/ source.
s/wallpapers/wallpaper

[bshe, 2012-04-20 19:09:15]

Thanks!

+sky for OWNERS ash/*
+jhawkins for OWNERS options2/*

http://codereview.chromium.org/10021066/diff/21001/ash/desktop_background/des...
File ash/desktop_background/desktop_background_resources.cc (right):

http://codereview.chromium.org/10021066/diff/21001/ash/desktop_background/des...
ash/desktop_background/desktop_background_resources.cc:226: // -1 reserved for
random wallpaper and -2 for customized wallpaper.
Its not been used yet. I will add them in the CLs implementing random and
customized features.

On 2012/04/20 16:58:18, flackr wrote:
> Are these in use yet? If so can you add constants for random and customized
too.

[James Hawkins, 2012-04-20 19:40:16]

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc
(left):

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc:68: 
Please don't make random whitespace changes like this.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc
(right):

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc:30:
bool ParseIndexFromPath(const std::string& path, int* index) {
Document method.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc:40: int
PathToIDR(const std::string& path) {
Document method.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h
(right):

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h:25: bool
IsDefaultWallpaperURL(const std::string url, int* wallpaper_index);
I'm assuming |wallpaper_index| must not be NULL.  If so please document.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h:25: bool
IsDefaultWallpaperURL(const std::string url, int* wallpaper_index);
|url| must not be empty?

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h:32: //
Overridden from ChromeURLDataManager::DataSource:
nit: ChromeURLDataManager::DataSource implementation.

[sky, 2012-04-20 19:51:05]

http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
File ash/desktop_background/desktop_background_resources.cc (right):

http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
ash/desktop_background/desktop_background_resources.cc:226: // -1 reserved for
random wallpaper and -2 for customized wallpaper.
This is awful. How about an enum: RANDOM, CUSTOMIZED, SPECIFIC?

[bshe, 2012-04-20 20:42:41]

+sky

http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
File ash/desktop_background/desktop_background_resources.cc (right):

http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
ash/desktop_background/desktop_background_resources.cc:226: // -1 reserved for
random wallpaper and -2 for customized wallpaper.
The positive index value is currently correspond to one of the default
wallpapers. So I guess I need to assign negative value to the enum for RANDOM,
CUSTOMIZED, SPECIFIC or a very large positive number. I am not sure if this is
preferred?

Also, it seems something similar is being used here:
http://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/browser/chromeos/lo...
. 

I am also planning to completely remove the index and use string instead for new
wallpaper UI. In that case, I will remove the ugly index here.

On 2012/04/20 19:51:05, sky wrote:
> This is awful. How about an enum: RANDOM, CUSTOMIZED, SPECIFIC?

[sky, 2012-04-20 21:04:00]

On Fri, Apr 20, 2012 at 1:42 PM,  <bshe@chromium.org> wrote:
> +sky
>
>
>
>
http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
> File ash/desktop_background/desktop_background_resources.cc (right):
>
>
http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
> ash/desktop_background/desktop_background_resources.cc:226: // -1
> reserved for random wallpaper and -2 for customized wallpaper.
> The positive index value is currently correspond to one of the default
> wallpapers. So I guess I need to assign negative value to the enum for
> RANDOM, CUSTOMIZED, SPECIFIC or a very large positive number. I am not
> sure if this is preferred?

Can't you have two separate things. One an enum dictating the type,
and secondarily an index into the wallpaper?

  -Scott

> Also, it seems something similar is being used here:
>
http://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/browser/chromeos/lo...
> .
>
> I am also planning to completely remove the index and use string instead
> for new wallpaper UI. In that case, I will remove the ugly index here.
>
>
> On 2012/04/20 19:51:05, sky wrote:
>>
>> This is awful. How about an enum: RANDOM, CUSTOMIZED, SPECIFIC?
>
>
> http://codereview.chromium.org/10021066/

[bshe, 2012-04-20 21:11:42]

+james

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc
(left):

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc:68: 
Sorry. Didn't notice it. Thanks.

On 2012/04/20 19:40:17, James Hawkins wrote:
> Please don't make random whitespace changes like this.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc
(right):

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc:30:
bool ParseIndexFromPath(const std::string& path, int* index) {
On 2012/04/20 19:40:17, James Hawkins wrote:
> Document method.

Done.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc:40: int
PathToIDR(const std::string& path) {
On 2012/04/20 19:40:17, James Hawkins wrote:
> Document method.

Done.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
File chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h
(right):

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h:25: bool
IsDefaultWallpaperURL(const std::string url, int* wallpaper_index);
On 2012/04/20 19:40:17, James Hawkins wrote:
> I'm assuming |wallpaper_index| must not be NULL.  If so please document.

Done.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h:25: bool
IsDefaultWallpaperURL(const std::string url, int* wallpaper_index);
On 2012/04/20 19:40:17, James Hawkins wrote:
> |url| must not be empty?

|url| seems can be empty but can't be null.

http://codereview.chromium.org/10021066/diff/21002/chrome/browser/ui/webui/op...
chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h:32: //
Overridden from ChromeURLDataManager::DataSource:
On 2012/04/20 19:40:17, James Hawkins wrote:
> nit: ChromeURLDataManager::DataSource implementation.

Done.

[bshe, 2012-04-20 21:32:48]

On 2012/04/20 21:04:00, sky wrote:
> On Fri, Apr 20, 2012 at 1:42 PM,  <mailto:bshe@chromium.org> wrote:
> > +sky
> >
> >
> >
> >
>
http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
> > File ash/desktop_background/desktop_background_resources.cc (right):
> >
> >
>
http://codereview.chromium.org/10021066/diff/21002/ash/desktop_background/des...
> > ash/desktop_background/desktop_background_resources.cc:226: // -1
> > reserved for random wallpaper and -2 for customized wallpaper.
> > The positive index value is currently correspond to one of the default
> > wallpapers. So I guess I need to assign negative value to the enum for
> > RANDOM, CUSTOMIZED, SPECIFIC or a very large positive number. I am not
> > sure if this is preferred?
> 
> Can't you have two separate things. One an enum dictating the type,
> and secondarily an index into the wallpaper?

Random and customize wallpaper type hasn't implemented yet. But using enum
dictating the type first sounds better than using the negative index. Added an
enum here. And when I started to implement it later on, I will use that enum.
Also I am not sure what "SPECIFIC" refer to? Do you mean the default wallpaper
type?
Could you please take another look? Thanks!

> 
>   -Scott
> 
> > Also, it seems something similar is being used here:
> >
>
http://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/browser/chromeos/lo...
> > .
> >
> > I am also planning to completely remove the index and use string instead
> > for new wallpaper UI. In that case, I will remove the ugly index here.
> >
> >
> > On 2012/04/20 19:51:05, sky wrote:
> >>
> >> This is awful. How about an enum: RANDOM, CUSTOMIZED, SPECIFIC?
> >
> >
> > http://codereview.chromium.org/10021066/

[sky, 2012-04-20 22:39:15]

LGTM

http://codereview.chromium.org/10021066/diff/33001/ash/desktop_background/des...
File ash/desktop_background/desktop_background_resources.cc (right):

http://codereview.chromium.org/10021066/diff/33001/ash/desktop_background/des...
ash/desktop_background/desktop_background_resources.cc:227: enum {
Used named enums, but don't add the enum until you need it.

[bshe, 2012-04-23 20:10:14]

+james 
friendly ping?

[James Hawkins, 2012-04-23 20:12:48]

LGTM

[commit-bot: I haz the power, 2012-04-23 20:15:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bshe@chromium.org/10021066/35001

[commit-bot: I haz the power, 2012-04-23 20:15:18]

Can't apply patch for file
chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc.
While running patch -p1 --forward --force;
patching file
chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc
Hunk #1 FAILED at 19.
Hunk #2 succeeded at 68 (offset -1 lines).
Hunk #3 succeeded at 87 (offset -1 lines).
1 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc.rej

[commit-bot: I haz the power, 2012-04-24 00:14:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bshe@chromium.org/10021066/40001

[commit-bot: I haz the power, 2012-04-24 02:06:02]

Change committed as 133602