summaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Collapse)AuthorAgeFilesLines
* Revert 149083 - Add command-line option to have an extra delay before blitting.jbauman@chromium.org2012-08-021-15/+0
| | | | | | | | | | | | | | This may help in tracking down any synchronization issues. BUG=135546 Review URL: https://chromiumcodereview.appspot.com/10836018 TBR=jbauman@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149686 0039d316-1c4b-4281-b951-d872f2087c98
* aura: Fix a couple of drag drop issues:varunjain@chromium.org2012-08-022-0/+11
| | | | | | | | | | | | | | | 1. Only DragDropController should be allowed to set the cursor while a drag-drop session is in progress. 2. For some wierd reason I was cancelling drag-drop on MOUSE_EXITED event. That is clearly wrong. BUG=138694 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10825143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149670 0039d316-1c4b-4281-b951-d872f2087c98
* Remove gfx_unittests target in favor of ui_unittestsdhollowa@chromium.org2012-08-022-32/+3
| | | | | | | | | | | | | | | Removes the gfx_unittests target from various .gyp files in favor of ui_unittests. This can be landed once the master builders are restarted with the change: https://chromiumcodereview.appspot.com/10778013 TEST=None BUG=133864 R=tony@chromium.org, hbono@chromium.org, petermayo@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10778019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149633 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 149604 - Support calling GrabWindowSnapshot when no BrowserProcess ↵joaodasilva@chromium.org2012-08-027-378/+0
| | | | | | | | | | | | | | instance is avaliable (eg. tests) BUG=139694 Review URL: https://chromiumcodereview.appspot.com/10821104 TBR=qfel@google.com Review URL: https://chromiumcodereview.appspot.com/10830135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149606 0039d316-1c4b-4281-b951-d872f2087c98
* Support calling GrabWindowSnapshot when no BrowserProcess instance is ↵qfel@google.com2012-08-027-0/+378
| | | | | | | | | | | avaliable (eg. tests) BUG=139694 Review URL: https://chromiumcodereview.appspot.com/10821104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149604 0039d316-1c4b-4281-b951-d872f2087c98
* views: Extract Widget observer into its own header file.tfarina@chromium.org2012-08-028-40/+64
| | | | | | | | R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10834079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149555 0039d316-1c4b-4281-b951-d872f2087c98
* Added missing file from http://codereview.chromium.org/10824139/saintlou@chromium.org2012-08-021-0/+0
| | | | | | | | | BUG=132686 TBR=oshima@chromium.org Review URL: https://chromiumcodereview.appspot.com/10829134 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149546 0039d316-1c4b-4281-b951-d872f2087c98
* Assets for new window close/maximize button, 100 andsaintlou@chromium.org2012-08-0266-0/+0
| | | | | | | | | | | 200% BUG=132686 TBR=oshima@chromium.org Review URL: https://chromiumcodereview.appspot.com/10824139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149542 0039d316-1c4b-4281-b951-d872f2087c98
* Add RenderText DirectionalityMode enum and support; etc.msw@chromium.org2012-08-0116-94/+182
| | | | | | | | | | | | | | | | | | | Add gfx::DirectionalityMode enum. Add RenderText::SetDirectionalityMode and member. Revise/consolidate RenderText::GetTextDirection. Expand on existing unit tests; minor cleanup. Consume GetTextDirection in layout initialization: -Windows: RenderTextWin::ItemizeLogicalText() -Linux: SetupPangoLayoutWithoutFont() -Mac: Add TODO in RenderTextMac::EnsureLayout() BUG=134746 TEST=Existing/updated unit tests, no behavioral changes! Review URL: https://chromiumcodereview.appspot.com/10807082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149503 0039d316-1c4b-4281-b951-d872f2087c98
* Check in 2x slider bar resources, also slightly adjust 1x resource files for ↵jennyz@google.com2012-08-0113-0/+0
| | | | | | | | | | | slider_thumb.png and slider_thumb_disabled.png. BUG=140077 TBR=sky,oshima Review URL: https://chromiumcodereview.appspot.com/10824133 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149500 0039d316-1c4b-4281-b951-d872f2087c98
* Makes NativeViewHostWin change the parent of the hwnd whensky@chromium.org2012-08-016-5/+108
| | | | | | | | | | | | | | | | | | | detaching. Without this the hwnd would remain parented so that if the widget containing the NativeViewHost was destroyed then the hwnd would get destroyed by virtue of being a child. Previously we had this logic in NativeTabContentsViewWin (lost in WebView refactoring), but it seems better to promote to NativeViewHostWin. BUG=132090 TEST=none R=ben@chromium.org,jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10832011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149459 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Fix some style nits.thestig@chromium.org2012-08-012-18/+18
| | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10830101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149456 0039d316-1c4b-4281-b951-d872f2087c98
* Fix position of web notification bubble and arrowstevenjb@chromium.org2012-08-016-32/+42
| | | | | | | | | | | | | | * Move GetAnchorRect into TrayBubbleView * Remove double RTL inversion and modify arrow offset logic * Add rtl_mirrored to BubbleBorder to support unmirrored rtl bubbles * Correctly align notifications and rebuild on shelf alignment change. BUG=137154 TEST=tests pass; alignment for web notifications matches the system tray bubble and works correctly on left and right launcher and wirth RTL. Review URL: https://chromiumcodereview.appspot.com/10808066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149445 0039d316-1c4b-4281-b951-d872f2087c98
* Initial iOS bring up of ui.noyau@chromium.org2012-08-016-7/+41
| | | | | | | | | | | A very bare minimum: only point, rect and size are compiled and no unittest support yet. BUG=None Review URL: https://chromiumcodereview.appspot.com/10837041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149435 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 149426 - Update cursor resources.flackr@chromium.org2012-08-0138-0/+0
| | | | | | | | | | | | | | Failing ash_unittests on linux chromiumos bots. BUG=131586 TEST=Cursors are 25x25 (1x) and 50x50 (2x) and still work in chromeos. Review URL: https://chromiumcodereview.appspot.com/10830119 TBR=flackr@chromium.org Review URL: https://chromiumcodereview.appspot.com/10829125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149430 0039d316-1c4b-4281-b951-d872f2087c98
* Update cursor resources.flackr@chromium.org2012-08-0138-0/+0
| | | | | | | | | BUG=131586 TEST=Cursors are 25x25 (1x) and 50x50 (2x) and still work in chromeos. Review URL: https://chromiumcodereview.appspot.com/10830119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149426 0039d316-1c4b-4281-b951-d872f2087c98
* Fix color chooser cleanup process.mukai@chromium.org2012-08-012-3/+7
| | | | | | | | | | | | | - In case of crbug.com/139441, End() should close the window but it also schedules OnColorChooserDialogClosed() and this has been released already. That call isn't necessary in this case, so set_listener to NULL. - tab is expected to call DidEndColorChooser() everytime it ends, thus it should be called in End() too. the callback to prevent the calling BUG=139441 Review URL: https://chromiumcodereview.appspot.com/10821087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149380 0039d316-1c4b-4281-b951-d872f2087c98
* chrome: Move browser_otr_state.h into chrome namespace.tfarina@chromium.org2012-08-011-1/+1
| | | | | | | | | BUG=133088 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10831084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149364 0039d316-1c4b-4281-b951-d872f2087c98
* win: Drop extra triangles in triangle fan used to flip image transport surface.apatrick@chromium.org2012-08-011-1/+1
| | | | | | | | BUG=135546 Review URL: https://chromiumcodereview.appspot.com/10843020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149362 0039d316-1c4b-4281-b951-d872f2087c98
* aura: use TestWebGraphicsContext3D for the shared contextspiman@chromium.org2012-08-011-1/+3
| | | | | | | | | | | | | | | | Previously, we would use a regular command buffer context for the shared offscreen contexts, which is unable to share resources with the TestWebGraphicsContext3D, raising asserts if for example filters are used in layers. This change makes us use TestWebGraphicsContext3D for all contexts when using --test-compositor BUG=139300 Review URL: https://chromiumcodereview.appspot.com/10828088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149357 0039d316-1c4b-4281-b951-d872f2087c98
* Use EXPECT_FALSE instead to avoid compiler errorhongbo.min@intel.com2012-08-013-4/+4
| | | | | | | | | | BUG=139326 TEST=aura_unittests and views_unittests compile and run Review URL: https://chromiumcodereview.appspot.com/10824064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149356 0039d316-1c4b-4281-b951-d872f2087c98
* Valgrind/Heapchecker: Fix leaks in TabbedPaneTest.thestig@chromium.org2012-07-311-1/+14
| | | | | | | | | | BUG=139842 TEST=none TBR=ben Review URL: https://chromiumcodereview.appspot.com/10825110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149311 0039d316-1c4b-4281-b951-d872f2087c98
* Initialize aura::LocatedEvent::root_location_ correctly.yusukes@chromium.org2012-07-312-2/+2
| | | | | | | | | | BUG=none TEST=try passed Review URL: https://chromiumcodereview.appspot.com/10830087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149308 0039d316-1c4b-4281-b951-d872f2087c98
* Update webkit_resources to support high-dpi assetsrbyers@chromium.org2012-07-313-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move webkit_resource.grd to be in the same directory as all the resources. This is consistent with what we do elsewhere, and avoids a limitation of the new grit support for chrome_scaled_image (it expects 'context' to be a specific form). Move all the current images into a default_100_percent sub-directory. Images were added to their new location separately (due to try/cq limitations on binary files) here: http://src.chromium.org/viewvc/chrome?view=rev&revision=148389 Add support for the 2x text area resize corner image. Note that I didn't make the .cur files support multiple resolutions because .cur files themselves can contain multiple resolutions, and when we support high-DPI on windows (the only place these are used), we'll probably want to use multi-resolution .cur files so that the cursor seamlessly changes when moving between different density screens. Also fixes the addition of 'hand' cursors to be windows specific (as all the other cursors are now). TBR=sky@chromium.org BUG=134046 TEST= Review URL: https://chromiumcodereview.appspot.com/10701105 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149290 0039d316-1c4b-4281-b951-d872f2087c98
* Use occlusion query to test if blit is finishedjbauman@chromium.org2012-07-311-4/+21
| | | | | | | | | | | | This adds a command-line flag to use an occlusion query instead of an event query to test if the blit is finished. A more permanent patch will be made if this seems to fix our grey triangle issues. BUG=135546 Review URL: https://chromiumcodereview.appspot.com/10837015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149255 0039d316-1c4b-4281-b951-d872f2087c98
* maxHeight/Width and miniHeight/Width of chrome.appWindow API failed in ↵junmin.zhu@intel.com2012-07-312-0/+7
| | | | | | | | | | | | ShellWindow. BUG=138001 TEST=manually Review URL: https://chromiumcodereview.appspot.com/10802028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149219 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Windows XP and Vista taskbar activation issue.msw@chromium.org2012-07-311-2/+4
| | | | | | | | | | | | | | | On Windows XP and Vista, new windows don't indicate activation on the taskbar. (the window buttons should look "pressed" on launch and new window) This regression was introduced by http://crrev.com/104051 Limit the original fix for http://crbug.com/90386 to Windows > Vista. BUG=90386,123473 TEST=New Chrome window appear "pressed" on the taskbar on Vista and XP. No regressions (especially not of crbug.com/90386) Review URL: https://chromiumcodereview.appspot.com/10826058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149215 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the PNCodec error on Android caused by different Skia color format.shouqun.liu@intel.com2012-07-311-4/+7
| | | | | | | | | | | Make sure the test case to compare SkPMColor between SkPMColor, rather than SkColor. BUG=138933 TEST=ui_unittests --gtest_filter=PNGCodec.EncodeBGRASkBitmapDiscardTransparency Review URL: https://chromiumcodereview.appspot.com/10831031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149208 0039d316-1c4b-4281-b951-d872f2087c98
* views: Remove unused PaintLock API.tfarina@chromium.org2012-07-315-68/+2
| | | | | | | | | R=ben@chromium.org NOTRY=True Review URL: https://chromiumcodereview.appspot.com/10835027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149189 0039d316-1c4b-4281-b951-d872f2087c98
* (Views only)Resize the menu buttons on the Website Settings UI to fit the ↵markusheintz@chromium.org2012-07-312-4/+8
| | | | | | | | | | | button text. BUG=113688 TEST=none Review URL: https://chromiumcodereview.appspot.com/10829038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149173 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the method GetSelectedTab of the class NativeTabbedPaneView to return ↵markusheintz@chromium.org2012-07-313-58/+90
| | | | | | | | | | | | | | the tab contents of the currently selected tab. Change the unittest to cover the NativeTabbedPaneViews and the NativeTabbedPaneWin. BUG=139159 TEST=ui\views\control\tabbed_pane\tabbe_pane_view_unittest.cc Review URL: https://chromiumcodereview.appspot.com/10831009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149158 0039d316-1c4b-4281-b951-d872f2087c98
* Make '=' and function keys on a keypad work.yusukes@chromium.org2012-07-311-2/+8
| | | | | | | | | | BUG=139407 TEST=None Review URL: https://chromiumcodereview.appspot.com/10832055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149112 0039d316-1c4b-4281-b951-d872f2087c98
* Do not CHECK that handle returned by eglQuerySurfacePointerANGLE is non-null.apatrick@chromium.org2012-07-311-2/+0
| | | | | | | | | | CHECK was to determine whether this failure is possible. It is. BUG=139145 Review URL: https://chromiumcodereview.appspot.com/10823045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149087 0039d316-1c4b-4281-b951-d872f2087c98
* Add command-line option to have an extra delay before blitting.jbauman@chromium.org2012-07-301-0/+16
| | | | | | | | | | | | This may help in tracking down any synchronization issues. BUG=135546 Review URL: https://chromiumcodereview.appspot.com/10836018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149083 0039d316-1c4b-4281-b951-d872f2087c98
* aura: Rename OnWindowVisisbilityChanged() to OnWindowTargetVisibilityChanged().tfarina@chromium.org2012-07-308-12/+11
| | | | | | | | | | | Note: This was a TODO for sky@. R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10796106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148952 0039d316-1c4b-4281-b951-d872f2087c98
* views: Enable ViewTest.RemoveNotification on Linux.tfarina@chromium.org2012-07-301-6/+0
| | | | | | | | | | BUG=139083 R=ben@chromium.org NOTRY=True Review URL: https://chromiumcodereview.appspot.com/10821083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148950 0039d316-1c4b-4281-b951-d872f2087c98
* Introduce RootWindowHostDelegate. The RootWindowHost performs most of its ↵ben@chromium.org2012-07-2917-376/+459
| | | | | | | | | | | communication with RootWindow via this interface. The intent is to make the contract between RootWindowHost and RootWindow clearer. BUG=none TEST=existing Review URL: https://chromiumcodereview.appspot.com/10825050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148912 0039d316-1c4b-4281-b951-d872f2087c98
* views/examples: Pure pedantic change.tfarina@chromium.org2012-07-289-33/+33
| | | | | | | | | | | No need of views:: while already inside views namespace. Using views:: is incosistent, as at other places in examples we don't use it. R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10824016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148904 0039d316-1c4b-4281-b951-d872f2087c98
* Support copying a partial rectangle region from the compositing surface on Win.mazda@chromium.org2012-07-282-30/+51
| | | | | | | | | | BUG=118571 TEST=Manual Review URL: https://chromiumcodereview.appspot.com/10829054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148889 0039d316-1c4b-4281-b951-d872f2087c98
* aura: apply brightness filter last to improve perfpiman@chromium.org2012-07-271-4/+8
| | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=92059 adds an optimization on color matrix filters so that they can be combined in a single pass as long as the resulting colors don't need to be clamped. Brightness needs clamping, so it should go last. This also fixes an uninitialized value that made us stick a grayscale filter randomly on layers. BUG=138645 TEST=new startup animation Review URL: https://chromiumcodereview.appspot.com/10833027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148837 0039d316-1c4b-4281-b951-d872f2087c98
* Use correct coordinates for last moust location in SynthesizeMouseMoveEventoshima@chromium.org2012-07-271-1/+1
| | | | | | | | | BUG=139236 TEST=see bug description Review URL: https://chromiumcodereview.appspot.com/10821060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148834 0039d316-1c4b-4281-b951-d872f2087c98
* mac: Switch to "new" (10.6) block-based panel apisthakis@chromium.org2012-07-271-52/+27
| | | | | | | | | | | | | | The new APIs enable saving of general NSURLs. Strip NSURLs that aren't isFileURLs. The old apis are deprecated in the 10.8 sdk. BUG=139138 TBR=sky Review URL: https://chromiumcodereview.appspot.com/10829053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148818 0039d316-1c4b-4281-b951-d872f2087c98
* Use current gtk dialogs in linux_aura.erg@chromium.org2012-07-272-2/+13
| | | | | | | | | | | | | | | They payoff for the last month of refactoring: We now use the LinuxUI interface to generate gtk file selection dialogs from the shim library. We could theoretically make a Qt or EFL shim and get those desktops' native open dialogs. BUG=136909, 134167 TEST=none Review URL: https://chromiumcodereview.appspot.com/10829021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148813 0039d316-1c4b-4281-b951-d872f2087c98
* Deprecate unused views::Label::SetURL().msw@chromium.org2012-07-273-42/+1
| | | | | | | | | | | | | | | | | Reasons to deprecate: 1) This function is unused in production. 2) The directionality code was wrong: 2a: Used Unicode control character wrapping. 2b: DCHECKing URL validity precludes invalid schemes with RTL leading substrings anyway. 3) The only tangible benefit (calling ui::ElideURL) is minimal. 4) It's easy to restore (or re-impl better) if needed. BUG=NONE TEST=NONE Review URL: https://chromiumcodereview.appspot.com/10829047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148806 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unused resource file for slider bar under ash subdirectory.jennyz@google.com2012-07-2714-0/+0
| | | | | | | | | | BUG=124087 TBR=sky TEST=NONE Review URL: https://chromiumcodereview.appspot.com/10820060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148797 0039d316-1c4b-4281-b951-d872f2087c98
* Implement new slider control and disable the volume control when audio is muted.jennyz@google.com2012-07-273-34/+117
| | | | | | | | | | | | | | Horizontal slider is implemented with image resources, and it changes UI based the on/off state. Vertical slider is kept in the old way, since I don't have the UI resources for drawing the vertical slider. I wonder if I should remove the vertical slider bar supporting code, or leave it as it which is what I choose to do currently. BUG=124097 TEST=Audio and brightness slider control should be in new UI, and audio slider bar should dim when muted. TBR=oshima@chromium.org Review URL: https://chromiumcodereview.appspot.com/10830027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148778 0039d316-1c4b-4281-b951-d872f2087c98
* Wrench menu needs to respond to touch events. girard@chromium.org2012-07-271-2/+2
| | | | | | | | | | | | | Touches generate emulated mouse events. The menu controller was unintentionally ignoring these events. BUG=138356 TEST= Review URL: https://chromiumcodereview.appspot.com/10831011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148767 0039d316-1c4b-4281-b951-d872f2087c98
* views: Make the color chooser gesture friendly.sadrul@chromium.org2012-07-271-37/+66
| | | | | | | | | BUG=138952 TEST=none Review URL: https://chromiumcodereview.appspot.com/10823046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148758 0039d316-1c4b-4281-b951-d872f2087c98
* gesture recognizer: Fix computing the bounding box of the rectangles.sadrul@chromium.org2012-07-273-3/+85
| | | | | | | | | | | | | | Accumulating all the positions of the touch-events of a single touch-point during its entire lifetime is not very useful. So instead, stop accumulating the positions when the point leaves the manhattan square. BUG=139175 TEST=none TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10831043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148750 0039d316-1c4b-4281-b951-d872f2087c98
* Use EXT_robustness where available on GLES2 platforms to detect and respond ↵kbr@chromium.org2012-07-2713-20/+78
| | | | | | | | | | | | to resets of the graphics card. BUG=138162 TEST=ran https://cvs.khronos.org/svn/repos/registry/trunk/public/webgl/conformance-suites/1.0.1/extra/slow-shader-example.html on Windows with ANGLE and verified that new code path was taken Review URL: https://chromiumcodereview.appspot.com/10822029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148721 0039d316-1c4b-4281-b951-d872f2087c98