summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Revert everything related to the relanding.erg@chromium.org2010-07-142-2/+0
| | | | | | Review URL: http://codereview.chromium.org/2982009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52367 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r52336.erg@chromium.org2010-07-142-0/+2
| | | | | | | | | | | | | | (I accidentally committed a previous version of the patch (the fixed version was in codereview since I had switched to my mac to address this exact compile failure.) BUG=none TEST=none TBR=evan Review URL: http://codereview.chromium.org/2937010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52349 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 52336 - More header cleanup:erg@chromium.org2010-07-142-2/+0
| | | | | | | | | | | | | | | | - Some cleanup to url_request.h - Remove task.h from headers that don't need it. - Remove histogram.h from message_loop.h BUG=none TEST=none Review URL: http://codereview.chromium.org/2986002 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2969006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52343 0039d316-1c4b-4281-b951-d872f2087c98
* More header cleanup:erg@chromium.org2010-07-142-0/+2
| | | | | | | | | | | | | - Some cleanup to url_request.h - Remove task.h from headers that don't need it. - Remove histogram.h from message_loop.h BUG=none TEST=none Review URL: http://codereview.chromium.org/2986002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52336 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up app_resources.grd:pkasting@chromium.org2010-07-1330-41/+13
| | | | | | | | | | | | * Alphabetize a couple entries * Move things to theme_resources.grd where possible; also fixes problems in chrome.gyp and theme_resources.grd that were causing "toolkit_views" to not be properly handled here, so this won't cause problems * Scope things only used by views under an appropriate conditional BUG=none TEST=none Review URL: http://codereview.chromium.org/2987003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52238 0039d316-1c4b-4281-b951-d872f2087c98
* Assign resource ids from a central file.tony@chromium.org2010-07-131-1/+1
| | | | | | | | | | | This allows us to control resource id assignment across all grd files so we can avoid id collisions. BUG=48625 Review URL: http://codereview.chromium.org/2961002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52211 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 52144 - Clean up app_resources.grd:pam@chromium.org2010-07-1330-13/+41
| | | | | | | | | | | | | | | | | | | | * Alphabetize a couple entries * Move things to theme_resources.grd where possible * Scope things only used by views under an appropriate conditional Reverting becasue it definitely causes ExtensionBrowserTest.Toolstrip to crash, and apparently causes crashes in the startup_tests too. TBR=pkasting BUG=none TEST=none Review URL: http://codereview.chromium.org/2953005 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/2897012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52175 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up app_resources.grd:pkasting@chromium.org2010-07-1230-41/+13
| | | | | | | | | | | | * Alphabetize a couple entries * Move things to theme_resources.grd where possible * Scope things only used by views under an appropriate conditional BUG=none TEST=none Review URL: http://codereview.chromium.org/2953005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52144 0039d316-1c4b-4281-b951-d872f2087c98
* Coverity: linux: fix leak in Clipboard::WriteData with disallowed format.mattm@chromium.org2010-07-121-2/+2
| | | | | | | | | | CID=9154 TEST=none BUG=none Review URL: http://codereview.chromium.org/2946006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52134 0039d316-1c4b-4281-b951-d872f2087c98
* Header cleanup: SkBitmap and other unnecessary includes.erg@chromium.org2010-07-122-2/+2
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2891008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52093 0039d316-1c4b-4281-b951-d872f2087c98
* GTK - don't paste a garbage text/html character.estade@chromium.org2010-07-101-2/+6
| | | | | | | | | | | | | When the clipboard text/html data terminates with NULL, drop it (WebKit used to do this for us before the parsing changed in roll 61629:61653). Some programs such as open office NULL terminate clipboard text/html data, even though it is unnecessary since the clipboard api provides a length for the data buffer. Chrome also NULL terminates text/html data in order to work around a bug in some versions of pidgin. Also, don't NULL terminate text/plain data, because no app I tested (firefox, gedit, midori, konqueror, OO) does this. BUG=48335 TEST=manual (see bug) Review URL: http://codereview.chromium.org/2896006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52034 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: Grouped buttons should be equal sizes in new wrench menu.erg@chromium.org2010-07-092-32/+15
| | | | | | | | | | | | | This completes the linux implementation of the new wrench menu. Turning on by default. Will watch how this goes. BUG=45757 TEST=Look at the menu. The size of the "cut," "copy" and "paste" buttons should be equal. Review URL: http://codereview.chromium.org/2961001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51974 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up .grds, step 1: Alphabetize.pkasting@chromium.org2010-07-081-110/+95
| | | | | | | BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51906 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: Minimize usage of gtk headers.erg@chromium.org2010-07-085-56/+102
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2891006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51898 0039d316-1c4b-4281-b951-d872f2087c98
* Implement new Chromium IPCs for copying/dragging.dcheng@chromium.org2010-07-071-2/+5
| | | | | | | | | | | A new ClipboardDispatcher interface has been added to handle the IPC calls. The new methods don't really belong on the existing Clipboard class, since that class deals with only copy and paste. On Windows and Mac, ClipboardDispatcher will share logic for copy/paste and drag/drop. GTK will have to use two separate code paths. BUG=31037 TEST=none Review URL: http://codereview.chromium.org/2842016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51790 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 51572 - Clean up .grds, step 1: Alphabetize.pkasting@chromium.org2010-07-021-95/+110
| | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2838041 TBR=pkasting@chromium.org Review URL: http://codereview.chromium.org/2864039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51575 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up .grds, step 1: Alphabetize.pkasting@chromium.org2010-07-021-110/+95
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2838041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51572 0039d316-1c4b-4281-b951-d872f2087c98
* Move WindowImpl to gfx so I can use it there for canvas unit tests.ben@chromium.org2010-07-023-347/+0
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2813042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51554 0039d316-1c4b-4281-b951-d872f2087c98
* Moves gtk accelerator processing functions to base/gtk_util so I cansky@chromium.org2010-07-011-0/+2
| | | | | | | | | | | | | use them from views and gfx. Sorry for the new patch on this and not an update. Not sure what happened. BUG=none TEST=none Review URL: http://codereview.chromium.org/2809047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51409 0039d316-1c4b-4281-b951-d872f2087c98
* Rename the Thumbnails database file to Favicons.nshkrob@chromium.org2010-06-301-1/+2
| | | | | | | | | | | The database will no longer store the thumbnails - TopSites is storing it's own thumbnails. BUG=None TEST=ThumbnailDatabaseTest Review URL: http://codereview.chromium.org/2842034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51294 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: Cleanups to the new wrench menu.erg@chromium.org2010-06-302-17/+55
| | | | | | | | | | | | | | | - Make the rendering for multiple buttons pretty by unifying sequnces of buttons. - Add the zoom label control and make the wrench menu model listen for notifications about zoom percentage changing. - Fixes crash that would have gone away once this was taken out from behind a flag BUG=45757 TEST=none Review URL: http://codereview.chromium.org/2799043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51266 0039d316-1c4b-4281-b951-d872f2087c98
* Change chrome from statically enabling high resolution timers on windowsmbelshe@chromium.org2010-06-291-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to enabling them dynamically - only when the application really needs them. I am working on some test cases for this, and will add them. But wanted to send out the concept for review. In this implementation, I modify the message loop to detect when the application has requested high resolution timers. Note that there are multiple MessageLoops active in a single process. After a period of time, we simply shut it off again. We could have set a timer or kept a count of active timers, or any number of more complex algorithms. But I think this algorithm is very simple and good enough. If an application continues needing high resolution timers for more than 1s, we'll turn the high-resolution timers back on again. One last change - since we've implemented the clamp at 4ms, there isn't a lot of point to our use of 1ms for timeBeginPeriod. I've modified that to 2 (which is half of 4ms, our target minimal interval). BUG=46531 TEST=MessageLoop.HighResolutionTimers Review URL: http://codereview.chromium.org/2822035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51102 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: delete the unencrypted login database file after a successful ↵mdm@chromium.org2010-06-292-1/+7
| | | | | | | | | | password store migration, since otherwise fragments of password data may be left in it. BUG=25404 TEST=the "Login Data" file should get deleted and recreated from scratch after migration Review URL: http://codereview.chromium.org/2866023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51094 0039d316-1c4b-4281-b951-d872f2087c98
* Make all changes to app/ run on all trybot platforms, not just the big three.erg@chromium.org2010-06-281-0/+3
| | | | | | | | | | | Anyone who's changing a header here may break the chromeos build. BUG=none TEST=none Review URL: http://codereview.chromium.org/2838027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51000 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup some unncessary dependencies on libxml.mad@google.com2010-06-271-1/+0
| | | | | | | | | | | As working on change committed in rev50132, instead of yet adding another project to the dependency list of libxml, I decided to abstract the dependency in the metrics helper. BUG=0 TEST=None Review URL: http://codereview.chromium.org/2753010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50952 0039d316-1c4b-4281-b951-d872f2087c98
* Reapply r50859 with chromeos fixes.erg@chromium.org2010-06-256-10/+205
| | | | | | | | | | | | | | | | GTK: First draft of the unified cut/copy/paste and +/-/Fullscreen menu items. Adds special menu item types that allow shoving buttons into them, along with tracking which button is selected. We now are halfway to the mocks that the chrome-ui-leads sent out. Review URL: http://codereview.chromium.org/2800015 BUG=45757 TEST=none Review URL: http://codereview.chromium.org/2879002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50896 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 50859 - GTK: First draft of the unified cut/copy/paste and ↵rafaelw@google.com2010-06-256-205/+10
| | | | | | | | | | | | | | | | | | +/-/Fullscreen menu items. Adds special menu item types that allow shoving buttons into them, along with tracking which button is selected. We now are halfway to the mocks that the chrome-ui-leads sent out. BUG=45757 TEST=none Review URL: http://codereview.chromium.org/2800015 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2836029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50865 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: First draft of the unified cut/copy/paste and +/-/Fullscreen menu items.erg@chromium.org2010-06-256-10/+205
| | | | | | | | | | | | | Adds special menu item types that allow shoving buttons into them, along with tracking which button is selected. We now are halfway to the mocks that the chrome-ui-leads sent out. BUG=45757 TEST=none Review URL: http://codereview.chromium.org/2800015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50859 0039d316-1c4b-4281-b951-d872f2087c98
* Add some comments to remind people of bad dependencies.tony@chromium.org2010-06-251-0/+2
| | | | | | | | TBR=mal Review URL: http://codereview.chromium.org/2808026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50821 0039d316-1c4b-4281-b951-d872f2087c98
* Move the bookmark manager into resources.pak.tony@chromium.org2010-06-243-3/+3
| | | | | | | | | | | | This allows for the bookmark manager to work after upgrading in the background on Linux. BUG=42770 TEST=Bookmark manager still works Review URL: http://codereview.chromium.org/2814009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50683 0039d316-1c4b-4281-b951-d872f2087c98
* Remove DIR_THEMES, I removed themes/default.{dll,pak} a longtony@chromium.org2010-06-232-11/+0
| | | | | | | | time ago. Review URL: http://codereview.chromium.org/2809028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50578 0039d316-1c4b-4281-b951-d872f2087c98
* Clang: Do not ignore result of HANDLE_EINTR.thakis@chromium.org2010-06-231-1/+3
| | | | | | Review URL: http://codereview.chromium.org/2805026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50556 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] Give the Wrench menu keyboard shortcuts.rsesek@chromium.org2010-06-222-0/+59
| | | | | | | | | | | Note that these key equivalents are for display only and do not get fired. Commands are routed through the main menu/CommandUpdater. BUG=45098 TEST=Open Wrench menu, see keyboard shortcuts. Review URL: http://codereview.chromium.org/2800019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50452 0039d316-1c4b-4281-b951-d872f2087c98
* Load net-internals resources from resources.pak.tony@chromium.org2010-06-222-11/+22
| | | | | | | | | | | | | | | This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50433 0039d316-1c4b-4281-b951-d872f2087c98
* gpu: add GLES/EGL support on linuxpiman@chromium.org2010-06-217-32/+204
| | | | | | Review URL: http://codereview.chromium.org/2829007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50397 0039d316-1c4b-4281-b951-d872f2087c98
* Speculatively revert 50374 (miniinstaller breakage) - Load netinternals ↵willchan@chromium.org2010-06-212-22/+11
| | | | | | | | | | | | | | | | | | | | resources from resources.pak. This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2799022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50392 0039d316-1c4b-4281-b951-d872f2087c98
* Load net-internals resources from resources.pak.erg@chromium.org2010-06-212-11/+22
| | | | | | | | | | | | | | | This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50374 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 50257 - Reland r50057. This is exactly the same except with two lines ↵erg@chromium.org2010-06-182-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | cherrypicked from tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793,42770 TEST=none TBR=tony Review URL: http://codereview.chromium.org/2800014 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2811016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50260 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r50057. This is exactly the same except with two lines cherrypicked fromerg@chromium.org2010-06-182-11/+22
| | | | | | | | | | | | | | | | | | | tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h} files. Load net-internals from the newly created resources.pak file. This patch also forces the loading of the optional DataPack for const correctness reasons Original Review: http://codereview.chromium.org/2855003 BUG=35793,42770 TEST=none TBR=tony Review URL: http://codereview.chromium.org/2800014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50257 0039d316-1c4b-4281-b951-d872f2087c98
* Tweaks for the merged menu:sky@chromium.org2010-06-171-4/+10
| | | | | | | | | | | | | | | | | | | | | . makes the menu show the same fonts regardless of whether the item has children. . adds text color to MenuConfig. I'm going to use this for the buttons added to the menu. . Changes TextButton to update text_size_ when the font changes. . Changes TextButton to allow you to specify how accelerators are shown. . Nukes TextButton::OnMousePressed as it's not needed (super implementation does the right thing and updates state the TextButton::OnMousePressed wasn't). . Changes accelerator to have constructor taking keycode and modifiers. BUG=45734 TEST=none Review URL: http://codereview.chromium.org/2833013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50108 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 50057 - Load net-internals from the newly created resources.pak file.erg@chromium.org2010-06-172-22/+11
| | | | | | | | | | | | | | This patch also forces the loading of the optional DataPack for const correctness reasons BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2855003 TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2852011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50059 0039d316-1c4b-4281-b951-d872f2087c98
* Load net-internals from the newly created resources.pak file.erg@chromium.org2010-06-172-11/+22
| | | | | | | | | | | This patch also forces the loading of the optional DataPack for const correctness reasons BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2855003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50057 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 49984 - patch from issue 2762014thakis@chromium.org2010-06-161-3/+1
| | | | | | | TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/2835007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50000 0039d316-1c4b-4281-b951-d872f2087c98
* patch from issue 2762014thakis@chromium.org2010-06-161-1/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49984 0039d316-1c4b-4281-b951-d872f2087c98
* Committing on behalf of p155off@gmail.com .kbr@google.com2010-06-154-78/+40
| | | | | | | | | | | | | Remove duplicated code in AcceleratedSurface using PbufferGLContext instead. This also fixes a crash caused by the OpenGL bindings not being initialized. BUG=46286 TEST=flash plugin 10.1 works again in both mac 10.5 and 10.6 Review URL: http://codereview.chromium.org/2782006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49836 0039d316-1c4b-4281-b951-d872f2087c98
* Mac/clang: Possibly contentious changes.thakis@chromium.org2010-06-151-2/+2
| | | | | | | | | | | | As discussed on irc, we're getting rid of const NSObjects, and we're making all properties nonatomic. const: All of cocoa takes nonconst NSObjects, and passing a const NSString to a function that takes NSString is a const violation. gcc doesn't complain about this, but clang intentionally does. constness is usually done via immutable base classes and mutable subclasses in cocoa anyway, so getting rid of const isn't that bad. Also, we don't really have a choice. nonatomic: Some of our classes have custom setters that are not @synchronized. If the @property for that is not non-atomic, then the interface claims that the method is synchronized but the implementation actually isn't. That's a bug. gcc happens not to complain about this, but clang does. Since we shouldn't need atomic properties anywhere, the simple rule is now to just make all properties nonatomic. Review URL: http://codereview.chromium.org/2769014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49808 0039d316-1c4b-4281-b951-d872f2087c98
* Load resources.pak, which should be located next to the chrometony@chromium.org2010-06-154-2/+76
| | | | | | | | | | | | | | | binary. resources.pak will contain all the files we currently have in the resources subdirectory (it currently only has net-internals files). On Linux, this is an eager load (before the zygote), but on Mac and Win, this is lazily loaded as needed. This isn't being used yet, just adding the necessary plumbing for now. BUG=42770 Review URL: http://codereview.chromium.org/2755006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49772 0039d316-1c4b-4281-b951-d872f2087c98
* Remove a ResourceBundle::GetDataResource and convert people totony@chromium.org2010-06-152-12/+1
| | | | | | | | | | the StringPiece version. In most cases, I didn't bother trying to make the calling code more efficient since nothing seems to be in time sensitive code. Review URL: http://codereview.chromium.org/2827001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49766 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Catch X errors and force a crash.thestig@chromium.org2010-06-112-0/+21
| | | | | | | | BUG=45020 TEST=See http://crosbug.com/3487 Review URL: http://codereview.chromium.org/2716007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49488 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting checkin in rev 48521 as creating a child window for GL rendering ↵vangelis@chromium.org2010-06-101-63/+5
| | | | | | | | | | | | | creates more problems than it solves. Hopefully either we'll find a more elegant solution or the problem will go away with the introduction of ANGLE. This patch is identical to: http://codereview.chromium.org/2644001/show which was checked in and reverted due to a build failure (which I believe was unrelated) Review URL: http://codereview.chromium.org/2721001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49441 0039d316-1c4b-4281-b951-d872f2087c98