(No comment was entered for this change.)

(No comment was entered for this change.)

These CL's up for review:
http://codereview.chromium.org/7655008/
http://codereview.chromium.org/7672012/

I've added mirandac & jstritar as reviewers. Feel free to add yourself as a reviewer if you wish.

 Issue 92200  has been merged into this issue.

The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=97958

------------------------------------------------------------------------
r97958 | achuith@chromium.org | Tue Aug 23 17:37:42 PDT 2011

Changed paths:
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/resources/ntp4/new_tab.js?r1=97958&r2=97957&pathrev=97958
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/resources/ntp4/new_tab.html?r1=97958&r2=97957&pathrev=97958

Support for promo in ntp4.

support for configurable timeouts in showNotification.
showNotification for serverpromo if the string exists, for 60 sec.
chrome.send('closePromo') on user dismissing promo.
support for html fragments in promo_line + use parseHtmlSubset to guard against xss injection.

BUG=93201
TEST=Setup user Preferences with valid promo_start/promo_end/promo_build. Create promo_line with embedded href. Promo should show up on new tab page upon launch. Should fade after 1 min if not interacted with. Closing it should result in it not appearing any more.
Review URL: http://codereview.chromium.org/7672012
------------------------------------------------------------------------

For M14/branch 835:
http://codereview.chromium.org/7719013/

Requesting merge for http://codereview.chromium.org/7719013/ into M14.

(No comment was entered for this change.)

The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=98150

------------------------------------------------------------------------
r98150 | achuith@chromium.org | Wed Aug 24 17:01:46 PDT 2011

Changed paths:
 M http://src.chromium.org/viewvc/chrome/branches/835/src/chrome/browser/web_resource/promo_resource_service.cc?r1=98150&r2=98149&pathrev=98150
 M http://src.chromium.org/viewvc/chrome/branches/835/src/chrome/common/pref_names.cc?r1=98150&r2=98149&pathrev=98150
 M http://src.chromium.org/viewvc/chrome/branches/835/src/chrome/common/pref_names.h?r1=98150&r2=98149&pathrev=98150
 M http://src.chromium.org/viewvc/chrome/branches/835/src/chrome/browser/web_resource/promo_resource_service_unittest.cc?r1=98150&r2=98149&pathrev=98150
 M http://src.chromium.org/viewvc/chrome/branches/835/src/chrome/browser/resources/new_tab.js?r1=98150&r2=98149&pathrev=98150

PromoResourceService fixes for 835.

Increase number of groups to 100.
Introduce ntp.promo_group_max.
Add max_group param to question.
Remove is_sync code from CanShowPromo.
Add is_valid_group code to CanShowPromo.
New promo trigger is based on promo_end only (and not 
    also on promo_start).
Reset group number on new promo, and not every time 
    the promo resource is downloaded.
Remove sync action from showPromoNotification.
Fix unit test.

BUG=93201
TEST=Should be able to see promo without sync text.
Review URL: http://codereview.chromium.org/7719013
------------------------------------------------------------------------

Think this is fixed, reopen if needed.

The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=101979

------------------------------------------------------------------------
r101979 | achuith@chromium.org | Tue Sep 20 10:54:00 PDT 2011

Changed paths:
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc?r1=101979&r2=101978&pathrev=101979
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/pref_names.h?r1=101979&r2=101978&pathrev=101979
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/web_resource/promo_resource_service.cc?r1=101979&r2=101978&pathrev=101979
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/web_resource/promo_resource_service_unittest.cc?r1=101979&r2=101978&pathrev=101979
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/web_resource/promo_resource_service.h?r1=101979&r2=101978&pathrev=101979
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/common/pref_names.cc?r1=101979&r2=101978&pathrev=101979

promo_resource_service fixes/cleanup for promos.

Remove is_synced check in CanShowPromo.
Add support for additional question param max_group_number.
Fix a bug where group was reset everytime the promo resource was fetched.
Breakup UnpackPromoSignal to a number of smaller helper functions
    for clarity, and so they can be individually unit-tested.
Put all the logic of whether to display a promo into CanShowPromo.
Get rid of unnecessary namespace PromoResourceServiceUtil.
Make IsBuildTargeted private.
Make GetChannel a private function in anonymous scope 
    to consolidate duplicated comments/code.
Delete unused web_resource_cache_.

BUG=93201
TEST=Only relevant change is removal of is_synced check in CanShowPromo.
Review URL: http://codereview.chromium.org/7655008
------------------------------------------------------------------------

Requesting merge into 874. Without http://codereview.chromium.org/7655008, new tab promos will not work in M15.

(No comment was entered for this change.)

Hi,

The M15 Beta is likely shipping tomorrow (9/22) -- what's the status of this CL? We'll want to merge it as soon as possible.

CL is ready to be merged. Have requested a merge...

Anantha: Testing steps.

This CL needs to land: http://codereview.chromium.org/7972022/ (it allows the promo resource to be downloaded every 3 min instead of every 48 hours). I hope to land it soon after the trybots succeed.

With this build, you need to launch chrome with
--promo-server-url='http://achuithz600.mtv.corp.google.com/www/files/promoresource?hl='

Now wait for 5 min for the promo url to get downloaded, then relaunch chrome and go to the ntp. You should see the chromebook promo. 

The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=102455

------------------------------------------------------------------------
r102455 | achuith@chromium.org | Fri Sep 23 00:43:31 PDT 2011

Changed paths:
 M http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/web_resource/promo_resource_service.cc?r1=102455&r2=102454&pathrev=102455

Minor debugging fix so we fetch promos every 3 min when we're testing.

BUG=93201
TEST=Launch chrome with --promo-service-url='http://achuithz600.mtv.corp.google.com/www/files/promoresource?hl='. Wait 5 min for the promoresource to get downloaded, then relaunch chrome (with the same switch) and go to the ntp. You should see the chromebook promo.

Review URL: http://codereview.chromium.org/7972022
------------------------------------------------------------------------

(No comment was entered for this change.)

The following revision refers to this bug:
    http://src.chromium.org/viewvc/chrome?view=rev&revision=103210

------------------------------------------------------------------------
r103210 | achuith@chromium.org | Wed Sep 28 16:55:12 PDT 2011

Changed paths:
 M http://src.chromium.org/viewvc/chrome/branches/874/src/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc?r1=103210&r2=103209&pathrev=103210
 M http://src.chromium.org/viewvc/chrome/branches/874/src/chrome/common/pref_names.h?r1=103210&r2=103209&pathrev=103210
 M http://src.chromium.org/viewvc/chrome/branches/874/src/chrome/browser/web_resource/promo_resource_service.cc?r1=103210&r2=103209&pathrev=103210
 M http://src.chromium.org/viewvc/chrome/branches/874/src/chrome/browser/web_resource/promo_resource_service_unittest.cc?r1=103210&r2=103209&pathrev=103210
 M http://src.chromium.org/viewvc/chrome/branches/874/src/chrome/browser/web_resource/promo_resource_service.h?r1=103210&r2=103209&pathrev=103210
 M http://src.chromium.org/viewvc/chrome/branches/874/src/chrome/common/pref_names.cc?r1=103210&r2=103209&pathrev=103210

Merge 101979 - promo_resource_service fixes/cleanup for promos.

Remove is_synced check in CanShowPromo.
Add support for additional question param max_group_number.
Fix a bug where group was reset everytime the promo resource was fetched.
Breakup UnpackPromoSignal to a number of smaller helper functions
    for clarity, and so they can be individually unit-tested.
Put all the logic of whether to display a promo into CanShowPromo.
Get rid of unnecessary namespace PromoResourceServiceUtil.
Make IsBuildTargeted private.
Make GetChannel a private function in anonymous scope 
    to consolidate duplicated comments/code.
Delete unused web_resource_cache_.

BUG=93201
TEST=Only relevant change is removal of is_synced check in CanShowPromo.
Review URL: http://codereview.chromium.org/7655008

TBR=achuith@chromium.org
Review URL: http://codereview.chromium.org/8073011
------------------------------------------------------------------------

Built and tested this with 874 on linux - seems to be working ok.