Add delete context menu for custom wallpapers and some ui tweaks

Add delete context menu for custom wallpapers and some ui tweaks


BUG=177691
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190540

[bshe, 2013-03-21 16:42:31]

Hi guys. Sorry for the frequent review request. This is a relatively small size
CL.

In this CL, I added a context menu for custom wallpapers so user can delete
their selected custom wallpaper from history. I have also added a resetWallpaper
api. If user deleted all custom wallpapers, the behavior is to set wallpaper to
default one and clears the copy of last custom wallpaper in shared user
directory.

Thanks!

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
File chrome/browser/resources/chromeos/wallpaper_manager/main.html (right):

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/main.html:55: <menu
id="wallpaper-context-menu" class="chrome-menu" visibleif="custom">
Use visibleif instead of hidden here because menu use hidden internally, so I
need to have another way to hidden it. Similar to the pattern used in file
manager to hidden menu on some target.

[miket_OOO, 2013-03-21 16:58:30]

lgtm

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
File chrome/browser/chromeos/extensions/wallpaper_private_api.cc (right):

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
chrome/browser/chromeos/extensions/wallpaper_private_api.cc:521:
wallpaper_manager->RemoveUserWallpaperInfo(email);
Could this parameter be const?

[flackr, 2013-03-21 21:51:18]

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
File chrome/browser/chromeos/extensions/wallpaper_private_api.h (right):

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
chrome/browser/chromeos/extensions/wallpaper_private_api.h:149: virtual bool
RunImpl() OVERRIDE;
I think all of these classes should have DISALLOW_COPY_AND_ASSIGN(ClassName).

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
File chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
(right):

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:288:
// The number of remaining custom wallpapers. The add new button in data
s/The number of/Calculate the number of

The second sentence is slightly confusing otherwise.

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:290:
var number = wallpaperGrid.dataModel.length - 1;
s/number/customWallpaperCount

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:315:
}
No check for if this is a custom wallpaper or not?

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:317:
event.canExecute = false;
Nit: Usually the pattern followed is to have multiple if lines that return if
conditions aren't met rather than nesting if's. i.e.
event.canExecute = false;
if (event.command.id != 'delete')
  return;

var selectedIndex = ...
if (selectedIndex == -1 || selectedIndex ==this.wallpaperGrid_.dataModel.length
-1)
  return;

event.canExecute = true;

[bshe, 2013-03-22 15:11:57]

Done. Thanks for review. PTAL

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
File chrome/browser/chromeos/extensions/wallpaper_private_api.cc (right):

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
chrome/browser/chromeos/extensions/wallpaper_private_api.cc:521:
wallpaper_manager->RemoveUserWallpaperInfo(email);
Sorry. You mean the parameter of RemoveUserWallpaperInfo? I think it is already
const reference.

On 2013/03/21 16:58:30, miket wrote:
> Could this parameter be const?

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
File chrome/browser/chromeos/extensions/wallpaper_private_api.h (right):

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
chrome/browser/chromeos/extensions/wallpaper_private_api.h:149: virtual bool
RunImpl() OVERRIDE;
It looks like all these functions are ExtensionFunction. And extension function
have already disallowed copy and assign. 
https://code.google.com/p/chromium/codesearch/#chromium/src/chrome/browser/ex...

So it may not necessary to do it here again?

On 2013/03/21 21:51:19, flackr wrote:
> I think all of these classes should have DISALLOW_COPY_AND_ASSIGN(ClassName).

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
File chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
(right):

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:288:
// The number of remaining custom wallpapers. The add new button in data
On 2013/03/21 21:51:19, flackr wrote:
> s/The number of/Calculate the number of
> 
> The second sentence is slightly confusing otherwise.

Done.

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:290:
var number = wallpaperGrid.dataModel.length - 1;
On 2013/03/21 21:51:19, flackr wrote:
> s/number/customWallpaperCount

Done.

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:315:
}
Good call. I have hide the context menu for online thumbnails. But it is even
safer to disable the command.
Done.

On 2013/03/21 21:51:19, flackr wrote:
> No check for if this is a custom wallpaper or not?

https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:317:
event.canExecute = false;
I was thinking to use this function if we ever want to add more commands to
context menu. The above pattern may not best fit if we want to do that, although
I am not sure if we would ever do it. For extensibility, maybe use a switch
cause a better fit here? But I am fine to change to the suggest pattern if you
insist.


On 2013/03/21 21:51:19, flackr wrote:
> Nit: Usually the pattern followed is to have multiple if lines that return if
> conditions aren't met rather than nesting if's. i.e.
> event.canExecute = false;
> if (event.command.id != 'delete')
>   return;
> 
> var selectedIndex = ...
> if (selectedIndex == -1 || selectedIndex
==this.wallpaperGrid_.dataModel.length
> -1)
>   return;
> 
> event.canExecute = true;

[bshe, 2013-03-25 14:32:15]

friendly ping? Thanks!

On 2013/03/22 15:11:57, bshe wrote:
> Done. Thanks for review. PTAL
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
> File chrome/browser/chromeos/extensions/wallpaper_private_api.cc (right):
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
> chrome/browser/chromeos/extensions/wallpaper_private_api.cc:521:
> wallpaper_manager->RemoveUserWallpaperInfo(email);
> Sorry. You mean the parameter of RemoveUserWallpaperInfo? I think it is
already
> const reference.
> 
> On 2013/03/21 16:58:30, miket wrote:
> > Could this parameter be const?
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
> File chrome/browser/chromeos/extensions/wallpaper_private_api.h (right):
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/chromeos/e...
> chrome/browser/chromeos/extensions/wallpaper_private_api.h:149: virtual bool
> RunImpl() OVERRIDE;
> It looks like all these functions are ExtensionFunction. And extension
function
> have already disallowed copy and assign. 
>
https://code.google.com/p/chromium/codesearch/#chromium/src/chrome/browser/ex...
> 
> So it may not necessary to do it here again?
> 
> On 2013/03/21 21:51:19, flackr wrote:
> > I think all of these classes should have
DISALLOW_COPY_AND_ASSIGN(ClassName).
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
> File
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js
> (right):
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
>
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:288:
> // The number of remaining custom wallpapers. The add new button in data
> On 2013/03/21 21:51:19, flackr wrote:
> > s/The number of/Calculate the number of
> > 
> > The second sentence is slightly confusing otherwise.
> 
> Done.
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
>
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:290:
> var number = wallpaperGrid.dataModel.length - 1;
> On 2013/03/21 21:51:19, flackr wrote:
> > s/number/customWallpaperCount
> 
> Done.
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
>
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:315:
> }
> Good call. I have hide the context menu for online thumbnails. But it is even
> safer to disable the command.
> Done.
> 
> On 2013/03/21 21:51:19, flackr wrote:
> > No check for if this is a custom wallpaper or not?
> 
>
https://codereview.chromium.org/12769017/diff/13001/chrome/browser/resources/...
>
chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js:317:
> event.canExecute = false;
> I was thinking to use this function if we ever want to add more commands to
> context menu. The above pattern may not best fit if we want to do that,
although
> I am not sure if we would ever do it. For extensibility, maybe use a switch
> cause a better fit here? But I am fine to change to the suggest pattern if you
> insist.
> 
> 
> On 2013/03/21 21:51:19, flackr wrote:
> > Nit: Usually the pattern followed is to have multiple if lines that return
if
> > conditions aren't met rather than nesting if's. i.e.
> > event.canExecute = false;
> > if (event.command.id != 'delete')
> >   return;
> > 
> > var selectedIndex = ...
> > if (selectedIndex == -1 || selectedIndex
> ==this.wallpaperGrid_.dataModel.length
> > -1)
> >   return;
> > 
> > event.canExecute = true;

[flackr, 2013-03-25 14:37:11]

lgtm

[commit-bot: I haz the power, 2013-03-25 15:17:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/12769017/29001

[commit-bot: I haz the power, 2013-03-25 15:18:04]

Presubmit check for 12769017-29001 failed and returned exit status 1.

INFO:root:Found 11 file(s).

Running presubmit commit checks ...
Running /b/commit-queue/workdir/chromium/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/browser/extensions/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/browser/resources/PRESUBMIT.py
Running /b/commit-queue/workdir/chromium/chrome/common/extensions/PRESUBMIT.py

** Presubmit Warnings **
Found lines longer than 80 characters (first 5 shown).
  chrome/browser/resources/chromeos/wallpaper_manager/js/main_scripts.js, line
21, 81 chars \
  chrome/browser/resources/chromeos/wallpaper_manager/js/main_scripts.js, line
25, 88 chars

Presubmit checks took 2.9s to calculate.

[bshe, 2013-03-26 01:19:20]

Committed patchset #4 manually as r190540 (presubmit successful).