| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
BUG=255585
TBR=mpcomplete
Review URL: https://chromiumcodereview.appspot.com/19106004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211552 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Remove aura from DisplayManager
-Introduced DislayManager::Delegate to decouple DisplayController
- Moved methods that requires aura to DisplayController
- Changed to use DisplayInfo to get native bounds instead of
RootWindow.
* Moved mirror_window_controller_ from Shell to DisplayControlller.
This should belong to DC rather than Shell.
BUG=253991
Review URL: https://chromiumcodereview.appspot.com/19038002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211357 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is set in container now, so no need to set individual window underneath.
* Set kStayInSameRootWindowKey to ShelfContainer, to be consistent with other containers.
* Rename launcher_container to shelf_container in RWC.cc.
BUG=256747
Review URL: https://chromiumcodereview.appspot.com/18688003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211331 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Hiding the desktop background was primarily for the black background
of shelf. Since crrev.com/18339008 achieves this with another approach,
there's no need to hide the desktop background.
The current code still hides the background for fullscreen / immersive
but background is anyways invisible in such mode.
BUG=None
R=jamescook@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18962002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211230 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
Consolidate the creation of each FramePainter into a helper function.
BUG=none
TEST=ash_unittests FramePainterTest
Review URL: https://chromiumcodereview.appspot.com/18519010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211061 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously the black color was achieved by hiding the desktop background.
Now shelf's background color is opaque black instead.
The first patch (r210763) was reverted due to test failure in win8.
BUG=252422
TEST=covered by the new tests
TBR=jamescook@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18637004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211053 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It used to move the mouse to the same location in screen
coordinates, but the case this would make sense is extremely
rare, especially with close lid mode. Instead, it simply
use the same native location if the mouse is still on one of
display, or move to the center of closest display if it ever
becomes outside of the display.
2) DisplayManager::Init has been renamed InitFromCommandLine and
changed to use the same Init process as on device. This should
allow us to detect errors on bots, that used to happen only on device.
3) removed unnecessary includes,dead code.
TBR=derat@chromium.org, mukai@chromium.org
BUG=253991
TEST=updated existing tests to match new behavior.
Review URL: https://codereview.chromium.org/18358006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211047 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Notification would be good enough, more consistent with existing
display notifications, and much simpler.
BUG=None
R=oshima@chromium.org
TBR=jamescook@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18269005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211028 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
PanelLayoutManagerTest.
BUG=256886
TEST=PanelLayoutManagerTest.PanelMoveBetweenMultipleDisplays
Review URL: https://chromiumcodereview.appspot.com/18720002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211012 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a bunch of cleanup for the internet_options_handler conversion
to NetworkHandler from NetworkLibrary. None of these changes are
directly related to that change, just some code cleanup to make things
easier to read.
BUG=189080
R=pneubeck@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210934
Review URL: https://codereview.chromium.org/18536012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210946 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Decided to use just nubmers for ChromeOS, but the text color is grey
when unread count is 0. Also this CL removes unnecessary image files.
BUG=249975
R=dewittj@chromium.org, stevenjb@chromium.org
TBR=jamescook@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18147014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210943 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
> Some network connect related cleanup
>
> This is a bunch of cleanup for the internet_options_handler conversion
> to NetworkHandler from NetworkLibrary. None of these changes are
> directly related to that change, just some code cleanup to make things
> easier to read.
>
> BUG=189080
> R=pneubeck@chromium.org
>
> Review URL: https://codereview.chromium.org/18536012
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/18915006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210939 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a bunch of cleanup for the internet_options_handler conversion
to NetworkHandler from NetworkLibrary. None of these changes are
directly related to that change, just some code cleanup to make things
easier to read.
BUG=189080
R=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/18536012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210934 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Revert 210763 "Sets the background color of shelf is opaque blac..."
> Sets the background color of shelf is opaque black when maximized.
>
> Previously the black color was achieved by hiding the desktop background.
> Now shelf's background color is opaque black instead.
>
> Note that right now BaseLayoutManagerTest fails, but it'll be fixed by
> crrev.com/18326024
>
> BUG=252422
> R=jamescook@chromium.org
> TEST=covered by the new tests
>
> Review URL: https://chromiumcodereview.appspot.com/18339008
TBR=mukai@chromium.org
Review URL: https://codereview.chromium.org/18980003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210772 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously the black color was achieved by hiding the desktop background.
Now shelf's background color is opaque black instead.
Note that right now BaseLayoutManagerTest fails, but it'll be fixed by
crrev.com/18326024
BUG=252422
R=jamescook@chromium.org
TEST=covered by the new tests
Review URL: https://chromiumcodereview.appspot.com/18339008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210763 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This updates ash's power-status code to deal with updated
PowerSupplyProperties sent by the power manager where:
a) the battery time-to-full estimate is set when the battery
is charging and time-to-empty is set when the battery is
discharging (previously, time-to-full was set whenever a
charger was connected)
b) negative battery time estimates are used in situations
where the current is close to zero, which would result in
a huge estimate
It also updates ash to not display estimates above one day
and to not show an estimate when the battery is discharging
while a charger is connected.
Finally, it makes some minor improvements to battery-time
accessibility strings.
BUG=252948,254173,chrome-os-partner:20343
Review URL: https://chromiumcodereview.appspot.com/18324014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210762 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
BUG=178469
Review URL: https://chromiumcodereview.appspot.com/18868004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210757 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=247085
BUG=257622
Review URL: https://chromiumcodereview.appspot.com/18104007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210744 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
Reduce Launcher Button state visual representation to none/running/active.
Remove the visual "Hop" for launcher button.
BUG=244990
Review URL: https://chromiumcodereview.appspot.com/17305004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210728 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
The RenderViewGone IPC and methods are incorrectly named, as those are used when a renderer process has died. Since we are passing in termination status around and usually iterating over all Render{Widget|View}Host in a specific process, it actually applies to the whole process. This CL renames all applicable instances of this method and the IPC message associated with it.
BUG=258087
Review URL: https://chromiumcodereview.appspot.com/18339006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210727 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Relanding this with fixes for the Win64 builder and addressing jam's comment to move the call to SetCursorResourceModuleName
to chrome_browser_main.cc.
To fix the Win64 builder issues, the SetCursorResourceModuleName function in cursor_loader_win.cc/.h has been wrapped in
a ifdef(USE_AURA) block. As per jam's comment I have moved the call to the SetCursorResourceModuleName function to
ChromeBrowserMainPartsWin::ToolkitInitialized
Make the SetCursorResourceModuleName function in the CursorLoaderWin class a static function and remove it from the
CursorLoader and CursorClient interface. This function is called during browser initialization which prevents race conditions
from reading the cursor module name before it was set.
This ensures that the non standard webkit cursors can be loaded correctly when needed.
Fixes bug https://code.google.com/p/chromium/issues/detail?id=257983
Bug=257983
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/18939004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210717 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
TBR=jamescook@chromium.org
BUG=253991
TEST=no functional change. all tests should pass.
Review URL: https://chromiumcodereview.appspot.com/18413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210706 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
The shortcut for projection touch HUD is now shown on the keyboard
overlay (Ctrl+Alt+/). Also, the shortcut itself was wrongly set to
Ctrl+Alt+9 which is now changed to Ctrl+Shift+9.
BUG=233567
Review URL: https://chromiumcodereview.appspot.com/18344016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210683 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=243359
TEST=Plug in an external display with a different size, open some panels on each display and change the primary display. Panels should move to the correct position on the new display.
Review URL: https://chromiumcodereview.appspot.com/18331014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210646 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=251922
R=jennyz@chromium.org
Review URL: https://codereview.chromium.org/18031020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210643 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
> Make the SetCursorResourceModuleName function in the CursorLoaderWin class a static function and remove it from the
> CursorLoader and CursorClient interface.
>
> This function is currently called from the ctor of the ChromeContentBrowserClient class which ensures that it happens
> when the browser starts up and avoids any race conditions due to code attempting to read the module name before it
> was set.
>
> This ensures that the non standard webkit cursors can be loaded correctly when needed.
> Fixes bug https://code.google.com/p/chromium/issues/detail?id=257983
>
> Bug=257983
> R=sky@chromium.org
>
> Review URL: https://codereview.chromium.org/18132011
TBR=ananta@chromium.org
Review URL: https://codereview.chromium.org/18786003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210634 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
static function and remove it from the
CursorLoader and CursorClient interface.
This function is currently called from the ctor of the ChromeContentBrowserClient class which ensures that it happens
when the browser starts up and avoids any race conditions due to code attempting to read the module name before it
was set.
This ensures that the non standard webkit cursors can be loaded correctly when needed.
Fixes bug https://code.google.com/p/chromium/issues/detail?id=257983
Bug=257983
R=sky@chromium.org
Review URL: https://codereview.chromium.org/18132011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210625 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=180892
TEST=PanelWindowResizerTest.PanelDetachReattachRight
Review URL: https://chromiumcodereview.appspot.com/18331013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210581 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
Status area updated for the alternate shelf layout, no longer has a visual hover state, uses images instead of shaded rounded rectangle, and has a visual 'pressed' state (also uses alternate default state art asset when the shelf is 'dimmed' to add contrast).
BUG=245012
Review URL: https://chromiumcodereview.appspot.com/18175003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210517 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A new preference is created showing if the projection touch HUD is
enabled or not. This preference is per-user and unsyncable. It is not
exposed anywhere in the UI, but can be toggled using the Ctrl+Alt+9
accelerator combination.
BUG=233567
Review URL: https://chromiumcodereview.appspot.com/18163006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210516 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The drag and drop tracker creates a non-drawing window for mouse capture
during the drag. Don't count non-drawing windows towards the "solo window"
header opacity computation.
BUG=248727
TEST=added to ash_unittests FramePainterTest
Review URL: https://chromiumcodereview.appspot.com/18654003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210458 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've met a regression caused by another CL, but I noticed that
the current code of BaseLayoutManagerTest seems a bit wrong. It
uses SetHostSize(), but it doesn't change the display's rectangle.
For example, MaximizeRootWindowResize changes the host size to
900x700, but actually the root window and display's size is still
800x600. The test still passes unexpectedly since SetHostSize() cancels
the work-area insets set at SetUp() (gfx::Inset(1, 2, 3, 4)).
The current code relies on really unstable behavior and I suspect
this is unexpected. It would be better to use UpdateDisplay() to
change the both root window and display's size at the same time.
BUG=None
R=jamescook@chromium.org, oshima@chromium.org
TEST=ash_unittests still succeeds
Review URL: https://chromiumcodereview.appspot.com/18326024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210452 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
r=mukai@chromium.org,stevenjb@chromium.org
TBR=johnnyg@chromium.org
BUG=254719
Review URL: https://chromiumcodereview.appspot.com/18247002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210425 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
background for the status area).
TBR=oshima@chromium.org
BUG=
Review URL: https://codereview.chromium.org/18242007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210417 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=256747
TEST=covered by test
Review URL: https://chromiumcodereview.appspot.com/18602002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210402 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I've seen this timeout get reached occasionally on slower
machines. The lock screen typically shows up soon
afterwards, so this results in ugly jank (the lock animation
is performed, an empty desktop is shown for four seconds,
the browser windows briefly reappear, and then they get
hidden again after the lock screen is ready).
The timeout is mostly just an artifact of the old design
where a separate window manager displayed the animation and
waited for Chrome to lock the screen, incidentally. I'm not
sure whether we really need it at all anymore.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/18452004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210383 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
Making base widget for panels translucent.
BUG=257090
Review URL: https://chromiumcodereview.appspot.com/18694006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210319 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
Custom wallpapers are now specified via command-line flags.
BUG=248764
Review URL: https://chromiumcodereview.appspot.com/18298009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210134 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Also change how we compute the title bounds, which provides better vertical
centering for popup window titles.
This broke due to panels changes crrev.com/183369 and crrev.com/157042
BUG=257068
TEST=added ash_unittests FramePainterTest.TitleIconAlignment
Review URL: https://chromiumcodereview.appspot.com/18652005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210117 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes a number of cases either not caught by the automated tool or that
have recently regressed.
BUG=110610
TBR=darin
Review URL: https://codereview.chromium.org/18308004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210048 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When popup window is maximized, we can't read its title because its color
is very similar to its background color. To make title more readable,
title color is changed to white when popup window is maximized.
R=jamescook@chromium.org
BUG=163156
TEST=Compiles, Visual test
Review URL: https://chromiumcodereview.appspot.com/18586003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210007 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds support for "--log-net-log" command line option in content_shell.
When the commandline option is specified, NetLogLogger is used to log all network activities to a file.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/17633005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209993 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This CL tracks Manager.ServiceCompleteList to provide a list of
favorite/preferred networks to the UI. It uses
Service.GetLoadableProfileEntries to remove preferred services.
A test UI is provided in the status area (behind a flag).
Stub behavior is updated to enable testing the UI on Linux.
BUG=251922
Review URL: https://chromiumcodereview.appspot.com/17778003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209950 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
Fixed the order of method body to match the order in header.
BUG=253991
Review URL: https://chromiumcodereview.appspot.com/18266004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209915 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
| |
This removes the PowerSupplyStatus struct in favor of
directly using PowerSupplyProperties protocol buffers sent
by the power manager.
BUG=254173
Review URL: https://chromiumcodereview.appspot.com/18307002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209830 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When user presses alt-tab, active window shows bouncing effect
when there is only one window.
R=jamescook@chromium.org
BUG=154150
TEST=Compiles, Visual test
Review URL: https://chromiumcodereview.appspot.com/18255004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209800 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
BUG=None
TEST=None
R=jamescook
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/18129005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209798 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
BUG=249518
R=jamescook@chromium.org
TEST=no break on ash_unittests
Review URL: https://chromiumcodereview.appspot.com/18427002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209774 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
> Factor out content shell and tests into a standalone gyp
>
> This simplifies using components in Content Shell. As components can
> depend on the content layer, trying to use a component from Content Shell
> results in a cross-reference of gyp files which isn't allowed on Mac.
>
> TBR=joi,robertshield (trivial one-line renames in gyp files)
>
> Review URL: https://chromiumcodereview.appspot.com/17366006
TBR=mnaganov@chromium.org
Review URL: https://codereview.chromium.org/18547009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209770 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
This is part of https://codereview.chromium.org/16305009/ but lost due to merge error.
TBR=stevenjb@chromium.org
BUG=none
Review URL: https://chromiumcodereview.appspot.com/18420004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209755 0039d316-1c4b-4281-b951-d872f2087c98
|