Pin apps from prefs on the mash shelf.

Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move LauncherItemController::GetAppTitle there.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.

Only use ChromeMashShelfController when use_ash=1.
(non-USE_ASH builds will lack profile-specific shelf integration)

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.

Committed: https://crrev.com/eee6c893709538dff16463312e72031cdd8b8c01
Cr-Commit-Position: refs/heads/master@{#391171}

[msw, 2016-04-27 01:06:11]

Description was changed from

==========
Pin apps from prefs on the mash shelf.

BUG=557406
==========

to

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Expose ChromeLauncherController's AppTabHelper & GetPinnedAppsFromPrefs.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Expose static LauncherItemController::GetAppTitle helper.

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
==========

[msw, 2016-04-27 01:06:12]

msw@chromium.org changed reviewers:
+ sky@chromium.org

[msw, 2016-04-27 01:08:30]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-27 01:08:48]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/60001

[commit-bot: I haz the power, 2016-04-27 01:10:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-27 01:10:59]

Dry run: Try jobs failed on following builders:
  ios_dbg_simulator_gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_gn...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)

[msw, 2016-04-27 02:13:02]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-27 02:13:17]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/80001

[msw, 2016-04-27 02:13:56]

Description was changed from

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Expose ChromeLauncherController's AppTabHelper & GetPinnedAppsFromPrefs.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Expose static LauncherItemController::GetAppTitle helper.

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
==========

to

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Expose ChromeLauncherController's AppTabHelper & GetPinnedAppsFromPrefs.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Expose static LauncherItemController::GetAppTitle helper.

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

[commit-bot: I haz the power, 2016-04-27 02:31:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-27 02:31:58]

Dry run: Try jobs failed on following builders:
  chromeos_amd64-generic_chromium_compile_only_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_amd64-...)
  chromeos_daisy_chromium_compile_only_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_daisy_...)
  chromeos_x86-generic_chromium_compile_only_ng on tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_x86-ge...)

[msw, 2016-04-27 18:49:46]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[msw, 2016-04-27 18:49:58]

Hey Scott, please take a look; thanks!

[commit-bot: I haz the power, 2016-04-27 18:50:03]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/100001

[commit-bot: I haz the power, 2016-04-27 19:18:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-27 19:18:36]

Dry run: Try jobs failed on following builders:
  win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[sky, 2016-04-27 21:01:34]

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
File chrome/browser/ui/ash/chrome_launcher_prefs.cc (right):

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/chrome_launcher_prefs.cc:171: void UpdatePinnedApps(const
std::string& app_id,
I see you're just moving this code, but have some random comments.

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/chrome_launcher_prefs.cc:177: *chrome_icon_added = true;
nit: always set to false early on to avoid possible ordering problems. Same goes
for app_list_icon_added.

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/chrome_launcher_prefs.cc:292: std::vector<std::string>
GetPinnedAppsFromPrefs(PrefService* prefs,
I'm assuming this is a straight move.

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
File chrome/browser/ui/ash/launcher/app_tab_helper.h (right):

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/launcher/app_tab_helper.h:17: class AppTabHelper {
I would avoid using the suffix TabHelper. TabHelper generally means you are a
content::WebContentsUserData, eg <SadTabHelper>:

class SadTabHelper : public content::WebContentsObserver,
                     public content::WebContentsUserData<SadTabHelper> {

class FindTabHelper : public content::WebContentsObserver,
                      public content::WebContentsUserData<FindTabHelper> {

[msw, 2016-04-29 20:56:36]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-29 20:56:59]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/120001

[commit-bot: I haz the power, 2016-04-29 20:59:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-29 20:59:56]

Dry run: Try jobs failed on following builders:
  ios_dbg_simulator_gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_gn on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_gn...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_compile_dbg_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_gn_rel on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_r...)
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[msw, 2016-04-29 22:09:46]

Patchset #7 (id:120001) has been deleted

[msw, 2016-04-29 22:14:28]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-04-29 22:14:40]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/160001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/160001

[msw, 2016-04-29 22:30:50]

Please take another look; thanks!

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
File chrome/browser/ui/ash/chrome_launcher_prefs.cc (right):

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/chrome_launcher_prefs.cc:177: *chrome_icon_added = true;
On 2016/04/27 21:01:33, sky wrote:
> nit: always set to false early on to avoid possible ordering problems. Same
goes
> for app_list_icon_added.

This function was called repeatedly with the same arguments (to determine if
they're ever added), so their values are deliberately not cleared on each call.
I've refactored GetPinnedAppsFromPrefs further to make this less confusing.

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/chrome_launcher_prefs.cc:292: std::vector<std::string>
GetPinnedAppsFromPrefs(PrefService* prefs,
On 2016/04/27 21:01:33, sky wrote:
> I'm assuming this is a straight move.

Not quite... I refactored this a bit, my next PS goes further.
I can revert to the original code with very minimal changes if you prefer.

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
File chrome/browser/ui/ash/launcher/app_tab_helper.h (right):

https://codereview.chromium.org/1921403002/diff/100001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/launcher/app_tab_helper.h:17: class AppTabHelper {
On 2016/04/27 21:01:33, sky wrote:
> I would avoid using the suffix TabHelper. TabHelper generally means you are a
> content::WebContentsUserData, eg <SadTabHelper>:
> 
> class SadTabHelper : public content::WebContentsObserver,
>                      public content::WebContentsUserData<SadTabHelper> {
> 
> class FindTabHelper : public content::WebContentsObserver,
>                       public content::WebContentsUserData<FindTabHelper> {
> 
> 

This was simply moving the existing class, but I've renamed it.

[msw, 2016-04-29 22:31:09]

Description was changed from

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Expose ChromeLauncherController's AppTabHelper & GetPinnedAppsFromPrefs.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Expose static LauncherItemController::GetAppTitle helper.

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

to

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper; Rename LauncherControllerHelper.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Expose static LauncherItemController::GetAppTitle helper.

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

[commit-bot: I haz the power, 2016-04-29 22:47:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-29 22:47:15]

Dry run: Try jobs failed on following builders:
  win_clang on tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_clang/builds/...)

[sky, 2016-05-02 15:21:48]

LGTM - Don't worry about reverting to original code with minimal changes

https://codereview.chromium.org/1921403002/diff/160001/chrome/browser/ui/ash/...
File chrome/browser/ui/ash/chrome_launcher_prefs.cc (right):

https://codereview.chromium.org/1921403002/diff/160001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/chrome_launcher_prefs.cc:298: const base::DictionaryValue*
dictionary = nullptr;
nit: move dictionary inside both for loops.

[msw, 2016-05-02 19:07:19]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-05-02 19:07:46]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/180001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/180001

[msw, 2016-05-02 19:57:17]

Description was changed from

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper; Rename LauncherControllerHelper.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Expose static LauncherItemController::GetAppTitle helper.

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

to

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move it to use_aura source set.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Move LauncherItemController::GetAppTitle to LauncherControllerHelper (static).

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

[msw, 2016-05-02 20:01:09]

Hey Scott, please take another quick look; I moved GetAppTitle to
LauncherControllerHelper, and now include that on non-ash builds.

https://codereview.chromium.org/1921403002/diff/160001/chrome/browser/ui/ash/...
File chrome/browser/ui/ash/chrome_launcher_prefs.cc (right):

https://codereview.chromium.org/1921403002/diff/160001/chrome/browser/ui/ash/...
chrome/browser/ui/ash/chrome_launcher_prefs.cc:298: const base::DictionaryValue*
dictionary = nullptr;
On 2016/05/02 15:21:48, sky wrote:
> nit: move dictionary inside both for loops.

Done.

[msw, 2016-05-02 20:01:26]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-05-02 20:02:25]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/200001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/200001

[commit-bot: I haz the power, 2016-05-02 21:21:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-02 21:21:04]

Dry run: This issue passed the CQ dry run.

[msw, 2016-05-02 22:56:16]

The CQ bit was checked by msw@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-05-02 22:57:03]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/220001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/220001

[msw, 2016-05-02 22:58:42]

Description was changed from

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move it to use_aura source set.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.
Move LauncherItemController::GetAppTitle to LauncherControllerHelper (static).

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

to

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move LauncherItemController::GetAppTitle there.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.

Only use ChromeMashShelfController when use_ash=1.
(non-USE_ASH builds will lack profile-specific shelf integration)

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

[msw, 2016-05-02 23:51:10]

Hey Scott, please take another look; thanks!

[commit-bot: I haz the power, 2016-05-03 00:20:09]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-03 00:20:11]

Dry run: This issue passed the CQ dry run.

[sky, 2016-05-03 03:58:23]

LGTM

[msw, 2016-05-03 04:51:44]

The CQ bit was checked by msw@chromium.org

[commit-bot: I haz the power, 2016-05-03 04:51:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1921403002/220001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1921403002/220001

[commit-bot: I haz the power, 2016-05-03 04:57:16]

Description was changed from

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move LauncherItemController::GetAppTitle there.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.

Only use ChromeMashShelfController when use_ash=1.
(non-USE_ASH builds will lack profile-specific shelf integration)

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

to

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move LauncherItemController::GetAppTitle there.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.

Only use ChromeMashShelfController when use_ash=1.
(non-USE_ASH builds will lack profile-specific shelf integration)

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

[commit-bot: I haz the power, 2016-05-03 04:57:17]

Committed patchset #11 (id:220001)

[commit-bot: I haz the power, 2016-05-03 04:58:46]

Description was changed from

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move LauncherItemController::GetAppTitle there.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.

Only use ChromeMashShelfController when use_ash=1.
(non-USE_ASH builds will lack profile-specific shelf integration)

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.
==========

to

==========
Pin apps from prefs on the mash shelf.

Add ShelfController::SetItemImage (for async icon loading).

Nix ChromeLauncherController::AppTabHelper pure-virtual interface.
Rename LauncherControllerHelper; move LauncherItemController::GetAppTitle there.
Add GetPinnedAppsFromPrefs, refactored from CLC::GetListOfPinnedAppsAndBrowser.
Use AppIconLoader in ChromeMashShelfController like ChromeLauncherController.

Only use ChromeMashShelfController when use_ash=1.
(non-USE_ASH builds will lack profile-specific shelf integration)

TODO: Consolidate AppIconLoader use (or refactor)?
TODO: Support pinning/unpinning items in mash.
TODO: Support launching pinned items, context menus, etc.

BUG=557406
R=sky@chromium.org
TEST=Mash shelf shows items pinned from profile prefs.

Committed: https://crrev.com/eee6c893709538dff16463312e72031cdd8b8c01
Cr-Commit-Position: refs/heads/master@{#391171}
==========

[commit-bot: I haz the power, 2016-05-03 04:58:47]

Patchset 11 (id:??) landed as
https://crrev.com/eee6c893709538dff16463312e72031cdd8b8c01
Cr-Commit-Position: refs/heads/master@{#391171}