summaryrefslogtreecommitdiffstats
path: root/views
Commit message (Collapse)AuthorAgeFilesLines
* The fix for http://code.google.com/p/chromium-os/issues/detail?id=5987scottbyer@google.com2010-09-101-1/+5
| | | | | | | | | | | | | | sets the initial allocation for a widget when a size is passed in to WidgetGtk::Init(). The timing of the init call as part of creating a new tab contents view means that the arrangment of the hierarchy isn't complete yet, so incorrect contents get shown. This goes back to the original behavior which is to ignore the initial size request (it's now ignored at the TabContentsViewGtk::CreateView level instead of being implicitly ignored in the WidgetGtk::Init code). BUG=53870 TEST=Create new tabs, no flash of old tabs seen. Review URL: http://codereview.chromium.org/3290016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59122 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bug in changing to side tabs that could result in making windowsky@chromium.org2010-09-091-0/+11
| | | | | | | | | | | | | | | | bigger. When you switch to side tabs we end up in a situations where if you ask for the computed requested size you'll get a larger value than the current bounds of the window. Gtk sees this and sizes the window. We really don't want to derive the requested size of WidgetGtk when used a window from the contents, instead we want it to be empty or use an explicitly set value. BUG=53654 TEST=see bug Review URL: http://codereview.chromium.org/3300023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58972 0039d316-1c4b-4281-b951-d872f2087c98
* [Win] Add per-plugin exceptions to content settings.bauerb@chromium.org2010-09-092-15/+26
| | | | | | | | | | | Screenshot: http://imgur.com/yxEzO.png BUG=39252 TEST=PluginExceptionsTableModel.* Review URL: http://codereview.chromium.org/3307014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58929 0039d316-1c4b-4281-b951-d872f2087c98
* views: Add initial Throbber example.tfarina@chromium.org2010-09-094-1/+104
| | | | | | | | | | | | BUG=None TEST=export GYP_DEFINES="toolkit_views", gclient runhooks, make -k view_examples, out/Debug/view_examples Go to the Trobber tab, see the throbber spinning. Review URL: http://codereview.chromium.org/3345010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58901 0039d316-1c4b-4281-b951-d872f2087c98
* Added entry points to view/View to dispatch and process TouchEvents.rjkroege@google.com2010-09-089-9/+401
| | | | | | | | | | | | This change is part of a series of changes to bring TouchEvent processing to views. BUG=na TESTED=compiled with and without touchui Review URL: http://codereview.chromium.org/3192002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58823 0039d316-1c4b-4281-b951-d872f2087c98
* Changes the max width for bookmark menus back to 400 and leaves themsky@chromium.org2010-09-072-9/+10
| | | | | | | | | | | | at 800 for the wrench menu. Apparently folks don't like wide bookmark menus. BUG=50653 TEST=see bug Review URL: http://codereview.chromium.org/3317011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58771 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bookmark menus to deal with multiple menus sharing the samesky@chromium.org2010-09-072-48/+123
| | | | | | | | | | | mnemonic. BUG=49728 TEST=see bug Review URL: http://codereview.chromium.org/3325015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58745 0039d316-1c4b-4281-b951-d872f2087c98
* Alway return interface from ViewAccessibility::get_accChild.ctguil@chromium.org2010-09-032-168/+71
| | | | | | | | | BUG=none TEST=Verify screen reader accessibility during events like nagivating toolbar or menus. Review URL: http://codereview.chromium.org/3292007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58547 0039d316-1c4b-4281-b951-d872f2087c98
* Factoring out views related unit-tests in their own exe.jcivelli@chromium.org2010-09-032-0/+90
| | | | | | | | | BUG=None TEST=Run view_unit_tests should run successfully on Windows and Linux toolkit views. Review URL: http://codereview.chromium.org/3256008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58439 0039d316-1c4b-4281-b951-d872f2087c98
* Re-lands 58186:bryeung@chromium.org2010-09-0344-210/+215
| | | | | | | | | | | | | | | | | | | | Original message: """ Move the keyboard files from base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 """ TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3354005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from ↵akalin@chromium.org2010-09-0244-215/+210
| | | | | | | | | | | | | | | | | | | | | base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 TBR=bryeung@chromium.org Review URL: http://codereview.chromium.org/3337006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.bryeung@chromium.org2010-09-0244-210/+215
| | | | | | | | | | | | | | | | Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58388 0039d316-1c4b-4281-b951-d872f2087c98
* Connect native view accessibles back to the accessibility tree.ctguil@chromium.org2010-09-021-5/+4
| | | | | | | | | BUG=none TEST=interactive_ui_tests:AccessibilityWinBrowserTest.ContainsRendererAccessibilityTree Review URL: http://codereview.chromium.org/3244011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58314 0039d316-1c4b-4281-b951-d872f2087c98
* Sending try jobs to linux_view is a strong signal that we should also send ↵thestig@chromium.org2010-09-021-2/+2
| | | | | | | | | | the try jobs to linux_chromeos, and vice versa. BUG=none TEST=none Review URL: http://codereview.chromium.org/3291005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58294 0039d316-1c4b-4281-b951-d872f2087c98
* Adds support for invisible menu items to bookmark menus and wires itsky@chromium.org2010-09-011-4/+7
| | | | | | | | | | | up for the wrench menu. BUG=46221, 54017 TEST=see bug Review URL: http://codereview.chromium.org/3289001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58218 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58186 - Move the keyboard files from base/ to app/.phajdan.jr@chromium.org2010-09-0144-215/+210
| | | | | | | | | | | | | Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98
* Move the keyboard files from base/ to app/.bryeung@chromium.org2010-09-0144-210/+215
| | | | | | | | | | | Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58186 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a regression in r56766oshima@chromium.org2010-09-011-0/+2
| | | | | | | | | | | CustomButton::OnKeyEvent should return false when the event is not handled BUG=chromium-os:6290 TEST=none Review URL: http://codereview.chromium.org/3276007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58111 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove unneeded headers from base/ (part 7)thestig@chromium.org2010-08-2710-29/+33
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3176026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57737 0039d316-1c4b-4281-b951-d872f2087c98
* Misc. minor cleanup.pkasting@chromium.org2010-08-271-2/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3107041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57710 0039d316-1c4b-4281-b951-d872f2087c98
* GTTF: Make our handling of Windows pre-processor symbols more consistent.phajdan.jr@chromium.org2010-08-261-5/+0
| | | | | | | | | | | | | | For example, there are differences between unit_tests and browser_tests, which cause ridiculous problems when moving a test between those. We're using the symbols anyway, so let's centralize it for maintainability. TEST=compile BUG=none Review URL: http://codereview.chromium.org/3173044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57555 0039d316-1c4b-4281-b951-d872f2087c98
* Makes the download shelf auto-close after the user opens all downloadssky@chromium.org2010-08-262-11/+32
| | | | | | | | | | | | and moves mouse off the shelf. BUG=27797 TEST=on windows download an item, open it, move the mouse off the download shelf and make sure it closes. Review URL: http://codereview.chromium.org/3177034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57541 0039d316-1c4b-4281-b951-d872f2087c98
* Fix regression caused by http://codereview.chromium.org/2768006/showscottbyer@chromium.org2010-08-251-0/+9
| | | | | | | | | | | | | Using the new preferred size attributes for non-GtkViewsFixed widgets won't do very much. Put the gtk_widget_size_allocation call back for those widgets. Add in a small check into the ScreenLockerTest.TestBasic to prevent any future such regression. BUG=chromium-os:5987 TEST=ScreenLockerTest.TestBasic Review URL: http://codereview.chromium.org/3181039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57373 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed error message bubbles according to the latest mocksdpolukhin@chromium.org2010-08-232-0/+9
| | | | | | | | | BUG=chromium-os:5762, chromium-os:5761 TEST=Enter wrong password on Chrome OS login screen. Review URL: http://codereview.chromium.org/3201003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57060 0039d316-1c4b-4281-b951-d872f2087c98
* Remove wstrings from bookmarks, part 12.viettrungluu@chromium.org2010-08-225-12/+17
| | | | | | | | | | | | | | - This changes RecentlyUsedFoldersComboModel::GetItemAt() to return a string16 instead of a wstring. - This entailed changing the base class, ComboboxModel, and shaving a herd of yaks. BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3159031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57021 0039d316-1c4b-4281-b951-d872f2087c98
* Disable the stop button when the user is hovering it and the page finishes ↵pkasting@chromium.org2010-08-203-4/+29
| | | | | | | | | | | | | | loading, so we don't look like we stay loading forever. This change only does this for Mac and Windows, as GTK is going to be trickier. This also fixes a pair of other bugs on Windows and Linux: * Because we were setting the timer after telling the browser to reload, and the browser was calling us back synchronously, the timer had no effect. * Because the timer firing changed modes with |force| set to true, if the page finished loading before the timer fired, the timer would flip the button back to reload. BUG=46981 TEST=Hover the reload button and hit F5. When the page finishes loading, the stop button should become disabled. Mousing away should change it to an enabled reload button. Review URL: http://codereview.chromium.org/3198005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56925 0039d316-1c4b-4281-b951-d872f2087c98
* Add in a browser test for dialog resizing, which was catching an issue with ↵scottbyer@chromium.org2010-08-206-20/+75
| | | | | | | | | | | | | the way we were using GTK in toolkit views. Possibly related to 27365 or 38785. http://code.google.com/p/chromium-os/issues/detail?id=4126 BUG=chromium-os:4126 TEST=HtmlDialogBrowserTest.SizeWindow Review URL: http://codereview.chromium.org/2768006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56919 0039d316-1c4b-4281-b951-d872f2087c98
* Display an infobar when content settings were created.jochen@chromium.org2010-08-204-21/+31
| | | | | | | | | | | | | | | The xib changes add a gradient view with an icon and a text field that is displayed as infobar. The text field is set to truncate. The blocked cookies label is set to wrap. The various views are connected to the new outlets. win: http://imgur.com/OmTxr.png linux: http://imgur.com/OmTxr mac: http://imgur.com/VbwFp BUG=49826 TEST=unit_tests Review URL: http://codereview.chromium.org/3108029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56913 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Remove dead code, use early returns to reduce indenting, shorten.pkasting@chromium.org2010-08-192-112/+70
| | | | | | | | | | This makes one behavioral change: a mouse release with a successful HitTest and |canceled| true will set the state to HOT instead of NORMAL. This seemed more correct to me. BUG=none TEST=none Review URL: http://codereview.chromium.org/3175027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56766 0039d316-1c4b-4281-b951-d872f2087c98
* Another take on menu's. This uses the hosting menu scroll view container as ↵dtseng@chromium.org2010-08-195-4/+22
| | | | | | | | | | | | | | | | | a menubar on which we can fire MENUSTART and MENUEND events. The end result is that we now have the following scenario when a user opens a menu. 1. focus lands on the menu button. 2. down arrow. 3. A "chromium" menu item appears. 4. down arrow (or enter). 5. The first menu item gets focused. The only differences from what we currently have is Jaws/NVDA no longer say "context menu opened" or "applications". The first real menuitem also doesn't get focused when the menu shows. BUG=none. TEST=use NVDA and Jaws to navigate the menu's (opening, closing, submenus, accelerators). Review URL: http://codereview.chromium.org/3155029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56715 0039d316-1c4b-4281-b951-d872f2087c98
* Convert FillRect(... SkPaint) to DrawRect() since it doesn't necessarily ↵pkasting@chromium.org2010-08-181-1/+1
| | | | | | | | | | fill, it just draws with the provided paint. BUG=none TEST=none Review URL: http://codereview.chromium.org/3165032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56589 0039d316-1c4b-4281-b951-d872f2087c98
* Convert GetDisplayStringInLTRDirectionality from wstring to string16.tony@chromium.org2010-08-181-1/+2
| | | | | | | | BUG=23581 Review URL: http://codereview.chromium.org/3108027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56535 0039d316-1c4b-4281-b951-d872f2087c98
* Refactors mouse watching out of TabStrip into a standalone class.sky@chromium.org2010-08-173-0/+230
| | | | | | | | | BUG=27797 TEST=none Review URL: http://codereview.chromium.org/3140008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56424 0039d316-1c4b-4281-b951-d872f2087c98
* Status menu change per chromium-os:5517xiyuan@chromium.org2010-08-172-2/+19
| | | | | | | | | | | | | | | | | | | | - Apply 10% white to selected menu button; - Remove the menu offset so that the menu is top aligned with toolbar; - Make all status area buttons derive from StatusAreaButton; - Move ClockMenuButton's text size logic into StatusAreaButton to share the logic with LanguageMenuButton; - Strip unused space from LanguageMenuButton so that it looks good with 10% white highlight; - Make LanguageMenuButton and ClockMenuButton center aligned; - Add 1-pixel padding at top when the vertical space is odd number so that text looks properly aligned with the icons; BUG=chromium-os:5517 TEST=Verify fix for chromium-os:5517. Review URL: http://codereview.chromium.org/3141019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56369 0039d316-1c4b-4281-b951-d872f2087c98
* Misc. cleanup: simplify some code, add a few commentspkasting@chromium.org2010-08-131-9/+3
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3143016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56106 0039d316-1c4b-4281-b951-d872f2087c98
* Rework gfx::Font by moving platform-specific code into inner classes.ben@chromium.org2010-08-1328-65/+74
| | | | | | | | | | | | | gfx::Font is a platform-neutral API shim that exists as a wrapper object to allow for the creation and lifetime of gfx::Font objects to remain consistent with past usage. gfx::PlatformFont is an interface implemented by the platform-specific inner classes (gfx::PlatformFontWin,Mac,Gtk). BUG=none TEST=existing unittests Review URL: http://codereview.chromium.org/3083022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56040 0039d316-1c4b-4281-b951-d872f2087c98
* Implement BrowserWindow deactivate on Linux (views and GTK).jcivelli@chromium.org2010-08-121-1/+1
| | | | | | | | | | | This is needed for pages to be able to deactivate the browser's or popup windows with window.blur(). BUG=51364 TEST=Open a page that calls window.blur(), it should move the browser window to the back of the Z order. Review URL: http://codereview.chromium.org/3159007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55907 0039d316-1c4b-4281-b951-d872f2087c98
* Lands http://codereview.chromium.org/3167002 for rjkroege:sky@chromium.org2010-08-112-0/+85
| | | | | | | | | | | Adds a TouchEvent class for views. BUG= TEST=compiled with and without touchui Review URL: http://codereview.chromium.org/3117010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55776 0039d316-1c4b-4281-b951-d872f2087c98
* Land 55232 again - Dispatch key event to bindings processing.xiyuan@chromium.org2010-08-111-0/+4
| | | | | | | | | | | | | This reverts http://src.chromium.org/viewvc/chrome?view=rev&revision=55284 BUG=chromium-os:4005 TEST=Default button of hosted native dialogs in ChromeOS should work. TBR=suzhe@chromium.org Review URL: http://codereview.chromium.org/2873109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55753 0039d316-1c4b-4281-b951-d872f2087c98
* Making window.focus() work in Chrome.jcivelli@chromium.org2010-08-115-2/+18
| | | | | | | | | | | | | | | | A patch on the WebKit side https://bugs.webkit.org/show_bug.cgi?id=43542 ensures we get the correct notification when window.focus()/blur() is called. This CL makes the browser active/unactive in response to the focus/blur message. BUG=29643 TEST=Visit gmail. Open an IM conversation window and pop-it out. Focus the browser (so the IM window is in the back). Click on the person name in the IM section of gmail. The conversation window should be brought back to the front. Repeat but this time minimize the conversation window. Review URL: http://codereview.chromium.org/3060045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55678 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Get rid of TreeNodeChildrenReordered.tfarina@chromium.org2010-08-112-41/+3
| | | | | | | | | | | | Reason: This function was never implemented by TreeNodeModel and is unlike it will be. Also it proved to not be necessary at all. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/3091016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55657 0039d316-1c4b-4281-b951-d872f2087c98
* Initialize most_recent_profile_ in constructor.ctguil@chromium.org2010-08-101-1/+1
| | | | | | | | | BUG=51631 TEST=Ensure chrome --first-run don't crash when opening the wrench menu. Review URL: http://codereview.chromium.org/3139002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55606 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove unneeded headers from base/ (part 5)thestig@chromium.org2010-08-071-1/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3041049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55349 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 55232 - Dispatch key event to bindings processing.nsylvain@chromium.org2010-08-061-4/+0
| | | | | | | | | | | | | | This properly activates the default widget on a GtkWindow. BUG=chromium-os:4005 TEST=Default button of hosted native dialogs in ChromeOS should work. Review URL: http://codereview.chromium.org/3087011 TBR=xiyuan@chromium.org Review URL: http://codereview.chromium.org/3038053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55284 0039d316-1c4b-4281-b951-d872f2087c98
* Dispatch key event to bindings processing.xiyuan@chromium.org2010-08-061-0/+4
| | | | | | | | | | | This properly activates the default widget on a GtkWindow. BUG=chromium-os:4005 TEST=Default button of hosted native dialogs in ChromeOS should work. Review URL: http://codereview.chromium.org/3087011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55232 0039d316-1c4b-4281-b951-d872f2087c98
* Improvements to accessibility extension api support for "views":dmazzoni@chromium.org2010-08-067-20/+20
| | | | | | | | | | | | | 1. Handles the new wrench menu. 2. Uses NotifyAccessibilityEvent to find out when focus changes, rather than installing focus change listeners that need to be cleaned up. BUG=none TEST=Updated AccessibilityEventRouterViewsTest.TestFocusNotification Review URL: http://codereview.chromium.org/3056045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55196 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove unneeded headers from base/ (part 3)thestig@chromium.org2010-08-061-2/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3037044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55192 0039d316-1c4b-4281-b951-d872f2087c98
* Enable better NVDA support for custom menus.ctguil@chromium.org2010-08-066-11/+29
| | | | | | | | | | | | - Send the popupmenu events on the MenuScrollViewContainer since it is the View with the ROLE_MENUPOPUP role. - Return AccessibilityTypes::STATE_FOCUSED for MenuScrollViewContainer since it's not focused by MenuHostWin::ShowMenuHost. NVDA won't process children menu item's focus events unless a parent claims to have focus. TEST=The wrench menu and it's menu items are read aloud when using NVDA. BUG=49360 Review URL: http://codereview.chromium.org/3015055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55163 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove unneeded headers from base/ (part 1)thestig@chromium.org2010-08-051-1/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3071012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55034 0039d316-1c4b-4281-b951-d872f2087c98
* [Linux views]Fix the return value of WidgetGtk::HandleKeyboardEvent().suzhe@chromium.org2010-08-051-1/+2
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3063025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55028 0039d316-1c4b-4281-b951-d872f2087c98