Settings->Advanced->Content settings are now applied correctly in Guest Mode

Settings->Advanced->Content settings are now applied correctly in Guest Mode

BUG=chromium-os:13205
TEST=Tested manually. Content settings work correctly in Guest mode, but are not stored to Default settings (as expected)


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

[James Hawkins, 2012-02-29 15:15:09]

lgtm

https://chromiumcodereview.appspot.com/9522016/diff/1/chrome/browser/ui/webui...
File chrome/browser/ui/webui/options2/content_settings_handler2.cc (right):

https://chromiumcodereview.appspot.com/9522016/diff/1/chrome/browser/ui/webui...
chrome/browser/ui/webui/options2/content_settings_handler2.cc:719: if
(chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
Optional nit: no braces for single-line blocks.

[Denis Kuznetsov (DE-MUC), 2012-02-29 15:55:43]

https://chromiumcodereview.appspot.com/9522016/diff/1/chrome/browser/ui/webui...
File chrome/browser/ui/webui/options2/content_settings_handler2.cc (right):

https://chromiumcodereview.appspot.com/9522016/diff/1/chrome/browser/ui/webui...
chrome/browser/ui/webui/options2/content_settings_handler2.cc:719: if
(chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
On 2012/02/29 15:15:09, James Hawkins wrote:
> Optional nit: no braces for single-line blocks.

Done.

[commit-bot: I haz the power, 2012-02-29 15:56:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/antrim@chromium.org/9522016/4001

[commit-bot: I haz the power, 2012-02-29 15:56:22]

Can't apply patch for file
chrome/browser/ui/webui/options2/content_settings_handler2.cc.
While running patch -p1 --forward --force;
patching file chrome/browser/ui/webui/options2/content_settings_handler2.cc
Hunk #2 FAILED at 712.
1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/options2/content_settings_handler2.cc.rej

[Denis Kuznetsov (DE-MUC), 2012-02-29 16:06:28]

Please take a brief look again -- had to merge with trunk.

[James Hawkins, 2012-02-29 20:25:18]

lgtm

[commit-bot: I haz the power, 2012-03-01 06:36:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/antrim@chromium.org/9522016/5002

[commit-bot: I haz the power, 2012-03-01 09:42:22]

Change committed as 124391