summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sync: Follow-up to conflict resolution refactorrlarocque@chromium.org2012-11-0137-439/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part two of r164286. That commit refactored the way we handle conflict resolution. This commit takes advantage of those changes to delete lots of code. Because this change deletes session_state.cc, I decided to move the two remaining useful tests session_state_unittest.cc into their own files, sync_session_snapshot_unittest.cc and sync_source_info_unittest.cc. The tests were not modified in any way. None of these changes should have any effect on syncer behaviour: - We can remove the simple conflict counters and related code, since we now assert that all conflicts will be resolved by the end of a successful sync cycle. - We can remove the PerModelSafeGroupState because that struct no longer has any members. - The 'conflicts_resolved' indicators are no longer set, so we can remove them. - Without those indicators, it's no longer possible to have any SYNC_CYCLE_CONTINUATION sync cycles. We can remove a few counters associated with them, as well as the 'has_more_to_sync' flag in the snapshot. - Without SYNC_CYCLE_CONTINUATION cycles, there's no longer any need for code that loops around SyncShare() in SyncSchedulerImpl. The SyncSession::PrepareForAnotherSyncCycle() function is no longer used, either. - The ScopedConflictResolver installed on the session during a sync cycle is no longer used, so all the code related to it can be deleted. BUG=147681,111280,156238 Review URL: https://chromiumcodereview.appspot.com/11314008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165474 0039d316-1c4b-4281-b951-d872f2087c98
* Set can_lose_context to false for Chrome OS.marcheu@chromium.org2012-11-011-0/+4
| | | | | | | | | | | | | | | This allows us to use 2D accelerated canvas on EGL and Chrome OS, where it was previously disabled. BUG=chromium-os:34278 TEST=check that accelerated canvas is enabled, try canvas 2D apps like fishie tank and entanglement, notice it's faster. Change-Id: I3b3616095967979f0cbeb52e16b749dc4f919f6f Review URL: https://chromiumcodereview.appspot.com/11367027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165473 0039d316-1c4b-4281-b951-d872f2087c98
* Fix site_instance DCHECK when loading restored tabs.tedchoc@chromium.org2012-11-011-1/+4
| | | | | | | | | | | | | Reload does not call the proper initialization bits required to bring the navigation_entries back to life. Need to call LoadIfNecessary() as called in session_restore (TabLoader::LoadNextTab) on desktop. BUG= Review URL: https://chromiumcodereview.appspot.com/11293025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165472 0039d316-1c4b-4281-b951-d872f2087c98
* Adding histogram for a LBS request latency. See bug.vadimt@chromium.org2012-11-012-0/+16
| | | | | | | | BUG=158787 Review URL: https://chromiumcodereview.appspot.com/11364009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165471 0039d316-1c4b-4281-b951-d872f2087c98
* Makes closing a window that triggers a workspace switch animatesky@chromium.org2012-11-011-0/+7
| | | | | | | | | | | | | again. I most likely broke this when I cleaned up the code. BUG=none TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/11370003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165470 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a crash that could occur if the user closed a tab with an uncommitted ↵pkasting@chromium.org2012-11-014-103/+124
| | | | | | | | | | | | search navigation that we were planning to show a GoogleURLTracker infobar for. In this case the WebContents being destroyed does not necessarily have a valid InfoBarTabHelper anymore. This also fixes names and comments relating to the EntryMap (nee InfoBarMap) that probably should have been changed when I added GoogleURLTrackerMapEntry. BUG=158201 TEST=none Review URL: https://codereview.chromium.org/11339060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165468 0039d316-1c4b-4281-b951-d872f2087c98
* Adding histogram for Windows Wifi scan latency. See bug.vadimt@chromium.org2012-11-011-0/+14
| | | | | | | | BUG=158787 Review URL: https://chromiumcodereview.appspot.com/11360018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165467 0039d316-1c4b-4281-b951-d872f2087c98
* Adding HTML capture support for Android.aurimas@chromium.org2012-11-012-0/+6
| | | | | | | | | | | | | | | | Adding HTML capture support for Android. Following specs in http://www.w3.org/TR/html-media-capture/ TEST=Navigate to http://tinkerbin.com/y7ehI4rl and click on "Choose file" Camera app should be launched directly. BUG= Review URL: https://chromiumcodereview.appspot.com/11293037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165466 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 165462 - Revert part of r158595 so that I can re-commit it in a new ↵benjhayden@chromium.org2012-11-011-3/+3
| | | | | | | | | | | | | | smaller revision, which will be drover'd to 1271. @r165454 BUG=158737 Review URL: https://codereview.chromium.org/11312043 TBR=benjhayden@chromium.org Review URL: https://codereview.chromium.org/11369026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165465 0039d316-1c4b-4281-b951-d872f2087c98
* Move constrained web dialog code back to chrome/.avi@chromium.org2012-11-0119-98/+77
| | | | | | | | | | | | This partially reverts r139757. BUG= 107201,125841 TEST=no visible change Review URL: https://chromiumcodereview.appspot.com/11358027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165463 0039d316-1c4b-4281-b951-d872f2087c98
* Revert part of r158595 so that I can re-commit it in a new smaller revision, ↵benjhayden@chromium.org2012-11-011-3/+3
| | | | | | | | | | | which will be drover'd to 1271. @r165454 BUG=158737 Review URL: https://codereview.chromium.org/11312043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165462 0039d316-1c4b-4281-b951-d872f2087c98
* Use a reasonable default for the icon value in TestToolbarModel.lliabraa@chromium.org2012-11-011-1/+3
| | | | | | | | | | | ToolbarModel's GetIcon method returns a resource ID, so the TestToolbarModel should be initialized with a valid resource ID for |icon_|. This CL updates the TestToolbarModel to return IDR_LOCATION_BAR_HTTP by default instead of 0, which is never valid. BUG=None Review URL: https://chromiumcodereview.appspot.com/11362031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165461 0039d316-1c4b-4281-b951-d872f2087c98
* [Spellcheck] Cleanup for async posting of spellcheck requests.groby@chromium.org2012-11-013-100/+51
| | | | | | | | | BUG=154918 Review URL: https://chromiumcodereview.appspot.com/11365021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165460 0039d316-1c4b-4281-b951-d872f2087c98
* Use stderr rather than stdout for create_nmf errors.sbc@chromium.org2012-11-011-1/+1
| | | | | | | | | BUG= Review URL: https://chromiumcodereview.appspot.com/11340056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165459 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome-side change to add two Chinese fonts (licensed).jshin@chromium.org2012-11-015-26/+52
| | | | | | | | | | | | There are two other CLs on the Chrome-OS side. One is at https://gerrit.chromium.org/gerrit/#/c/36597/ and the other is internal. BUG=126735 TEST=Start ChromeOS in zh-CN or zh-TW and make sure that the UI font is sans-serif. Review URL: https://codereview.chromium.org/11029040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165458 0039d316-1c4b-4281-b951-d872f2087c98
* Upstream if-def on render_view_host_impl for Pop Up Menusyusufo@chromium.org2012-11-011-1/+1
| | | | | | | | | | | The if-def that routed the IPC on render_view_host_impl was left out BUG=158587 Review URL: https://chromiumcodereview.appspot.com/11338053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165457 0039d316-1c4b-4281-b951-d872f2087c98
* Upstream onSizeChanged and make sure afterSizeChanged gets calledyusufo@chromium.org2012-11-012-0/+11
| | | | | | | | | | | | | Because of a call missing from COntentView, we were always missing the first tap to an edit box which caused scrollFocusedNodeIntoView to not get called. BUG=158453 Review URL: https://chromiumcodereview.appspot.com/11338051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165456 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2012-11-011-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165455 0039d316-1c4b-4281-b951-d872f2087c98
* Notify FieldTrial observers only once group() is called for the first time.asvitkine@chromium.org2012-11-014-22/+140
| | | | | | | | | | | | | | This fixes the problem where observers would not see the correct value of the trial when Disable() is called. Also cleans up some style issues and DCHECKs that would never get hit. BUG=156202, 158801 TEST=New unit test FieldTrialTest.ObserveDisabled. Review URL: https://chromiumcodereview.appspot.com/11267044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165454 0039d316-1c4b-4281-b951-d872f2087c98
* extensions: Move gtk and mac versions of browser_action_test_util into their ↵tfarina@chromium.org2012-11-014-3/+2
| | | | | | | | | | | | | | | ui directories. Now that the views version was moved in r139880, we can move the gtk and mac too. BUG=None TEST=None R=aa@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/11308029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165453 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit 133141:133184.senorblanco@google.com2012-11-011-1/+1
| | | | | | | | TBR=podivilov Review URL: https://codereview.chromium.org/11360040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165452 0039d316-1c4b-4281-b951-d872f2087c98
* Remove a unnecessary synchronized method in ChromeBrowserProvider.michaelbai@chromium.org2012-11-011-1/+1
| | | | | | | | BUG=143971 Review URL: https://chromiumcodereview.appspot.com/11293022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165451 0039d316-1c4b-4281-b951-d872f2087c98
* Android: makes "apk_package" optional in adb_install_apk.pybulach@chromium.org2012-11-013-19/+37
| | | | | | | | | | | | We can derive the package name from the mandatory apk. BUG= TEST=adb_install_apk.py --apk ContentShell.apk Review URL: https://chromiumcodereview.appspot.com/11365004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165450 0039d316-1c4b-4281-b951-d872f2087c98
* Improve performance of registering font preferencesaberent@chromium.org2012-11-011-9/+23
| | | | | | | | | | | | | Rather than using the preference registry to check which font preferences are already registered keep track locally of which font preferences have defaults and don't attempt to register these a second time. Change-Id: Ib1f9bc3937f230f2250b2fecc2a0590dabb5e2ca BUG=158818 Review URL: https://chromiumcodereview.appspot.com/11307005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165449 0039d316-1c4b-4281-b951-d872f2087c98
* [cros] Camera stream stops when leaving camera view.ivankr@chromium.org2012-11-011-1/+7
| | | | | | | | | BUG=157387 Review URL: https://chromiumcodereview.appspot.com/11368027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165448 0039d316-1c4b-4281-b951-d872f2087c98
* Re-enable unit_tests on Dr. Memory Windows botbruening@google.com2012-11-011-4/+0
| | | | | | | | | | BUG=157132 TBR=rnk@chromium.org TEST=They now pass locally after tool bug fixes Review URL: https://codereview.chromium.org/11366039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165447 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r165444 "Add method to load resources without scale"oshima@chromium.org2012-11-0171-144/+186
| | | | | | | | | | TBR=oshima@chromium.org BUG=none TEST=none Review URL: https://codereview.chromium.org/11360041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165445 0039d316-1c4b-4281-b951-d872f2087c98
* Add method to load resources without scaleoshima@chromium.org2012-11-0171-186/+144
| | | | | | | | | | | | | This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h I'll cleanup ContentClient in separate CL. BUG=156569 TEST=none. no functional change. Review URL: https://chromiumcodereview.appspot.com/11341003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165444 0039d316-1c4b-4281-b951-d872f2087c98
* Use large resolution wallpaper when hook up a large external monitorbshe@chromium.org2012-11-0117-97/+498
| | | | | | | | | | | | If we hook up a external monitor that has a larger resoltuion than our small wallpaper resolution, we should load large resolution wallpaper. Otherwise, wallpaper do not cover all screen on the extern monitor. BUG=152221 Review URL: https://codereview.chromium.org/11234036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165443 0039d316-1c4b-4281-b951-d872f2087c98
* Added test for findbugs plugin.michaelbai@chromium.org2012-11-016-0/+102
| | | | | | | | | | | | | | - The java files had the issue that findbugd plugin need to find out, they compiled with the same configuration as chrome for android's. - The run_findbugs_plugin_tests.py runs the findbugs against the above Java classes, and expects to find the same issues as those in expected_result.txt. BUG=143971, 157970 Review URL: https://chromiumcodereview.appspot.com/11343057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165442 0039d316-1c4b-4281-b951-d872f2087c98
* Change memory manager policies to reflect renderers dropccameron@chromium.org2012-11-014-85/+71
| | | | | | | | | | | | | | | | their contents when visibility changes, so the GPU memory manager doesn't need to send them redundant messages to do so. Move statistics tracking for testing out of the manager and into the testing files. BUG=134750 Review URL: https://chromiumcodereview.appspot.com/11359016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165441 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Update calls froms RunAllPending() to RunUntilIdle().tfarina@chromium.org2012-11-015-6/+6
| | | | | | | | | | BUG=131220 TEST=compositor_unittests,ui_unittests,views_unittests R=sky@chromium.org Review URL: https://codereview.chromium.org/11346020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165440 0039d316-1c4b-4281-b951-d872f2087c98
* content/browser: Remove more unnecessary content:: calls.tfarina@chromium.org2012-11-016-61/+53
| | | | | | | | | R=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/11343062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165439 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2012-11-011-0/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165438 0039d316-1c4b-4281-b951-d872f2087c98
* Store a resource ID for sync root directory in DriveMetadataDB to make it ↵nhiroki@chromium.org2012-11-013-80/+167
| | | | | | | | | | | persistent BUG=158029 TEST=unit_tests --gtest_filter=\*DriveMetadataStoreTest\* Review URL: https://chromiumcodereview.appspot.com/11366026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165437 0039d316-1c4b-4281-b951-d872f2087c98
* Otherwise it will prevent the second renderer connecting to the ADMxians@chromium.org2012-11-013-3/+18
| | | | | | | | | BUG=158928 TEST=use apprtc.appspot.com to make a call, refresh the tab, and re-establish the call again. Audio should play. Review URL: https://chromiumcodereview.appspot.com/11358035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165436 0039d316-1c4b-4281-b951-d872f2087c98
* Roll third_party/findbugs to 163586 for Androidmichaelbai@chromium.org2012-11-011-0/+3
| | | | | | | | | | | BUG= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=164108 Review URL: https://chromiumcodereview.appspot.com/11271012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165435 0039d316-1c4b-4281-b951-d872f2087c98
* cc: Use gfx:: Geometry types for positions, bounds, and related things.danakj@chromium.org2012-11-0198-2508/+2581
| | | | | | | | | | | | | | | | | | | | | | | This covers layers, layer tree hosts, and related classes. *phew* I intentionally avoided anything to do with scrolling or page scale. Those should be changed to be Vectors and need a bit more thought. This change should be pretty mindless. It converts to gfx Rect, Size, Vector, and Point classes. No change is made for FloatPoint3D or FloatQuad yet. I've added cc/geometry.h as a place for free functions that don't exist on gfx types yet, and that we should port over in the future. No change in behaviour; covered by existing tests. BUG=147395 R=enne Review URL: https://codereview.chromium.org/11264056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165434 0039d316-1c4b-4281-b951-d872f2087c98
* Changes "Android-WebView" feature annotation to "WebView".klundberg@chromium.org2012-11-0131-282/+282
| | | | | | | | | | | | We wanted the Android feature annotations to match the features in crbug. Since the WebView feature was recently added to crbug, this CL updates all tests using the "Android-WebView" feature annotation to use "WebView" instead. BUG= Review URL: https://codereview.chromium.org/11231084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165432 0039d316-1c4b-4281-b951-d872f2087c98
* fix audio-only mode for media stream.wjia@chromium.org2012-11-011-3/+3
| | | | | | | | | Since the audio playback of media stream is hooked up with WebMediaPlayerMS, a URL is a media stream when it has either video track or audio track or both. BUG=158864 Review URL: https://codereview.chromium.org/11275090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165431 0039d316-1c4b-4281-b951-d872f2087c98
* fix win_aura not getting swap_ackscottmg@chromium.org2012-11-012-3/+5
| | | | | | | | | | | | | (hangs win aura rendering on startup) Regressed at https://chromiumcodereview.appspot.com/11341033/ R=vangelis@chromium.org, jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/11363018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165430 0039d316-1c4b-4281-b951-d872f2087c98
* Fix some flakiness in the retry logic of gtalk pyauto tests due to 2 issues:krenaud@google.com2012-11-012-12/+45
| | | | | | | | | | | | | 1) Old moles staying open between retries, and 2) Taking some time to re-direct to sign-in page. For issue (1), added logic to close all moles in case of retry so that they don't impact future runs. For issue (2), combined the logic of checking for the iframe and checking the iframe URL into a single wait. BUG=158794 Review URL: https://codereview.chromium.org/11365026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165429 0039d316-1c4b-4281-b951-d872f2087c98
* cc: Use base::Passed in ThreadProxyenne@chromium.org2012-11-012-13/+11
| | | | | | | | | R=jamesr@chromium.org BUG=none Review URL: https://codereview.chromium.org/11358026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165428 0039d316-1c4b-4281-b951-d872f2087c98
* SearchTabHelper doesn't need MODE_NTP_LOADINGdhollowa@chromium.org2012-11-013-146/+19
| | | | | | | | | | | | | Removes code to support the MODE_NTP_LOADING state. This is no longer used. BUG=158796 TEST=No functional change. Cleanup. R=sky@chromium.org Review URL: https://codereview.chromium.org/11358021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165427 0039d316-1c4b-4281-b951-d872f2087c98
* Use correct thread for audio capturing and encoding.sergeyu@chromium.org2012-11-018-1/+15
| | | | | | | | | | Previously video capture thread was passed to AudioScheduler instead of the dedicated audio thread. Fixed ChromotingHost so that the correct thread is given to AudioScheduler. BUG=157992 Review URL: https://codereview.chromium.org/11260053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165426 0039d316-1c4b-4281-b951-d872f2087c98
* Omnibox styling should be restored to defaultdhollowa@chromium.org2012-11-0111-247/+28
| | | | | | | | | | | | Removes searchbox styling from omnibox. BUG=158659 TEST=Create new tab, look at Omnibox styling. R=sky@chromium.org Review URL: https://codereview.chromium.org/11301051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165425 0039d316-1c4b-4281-b951-d872f2087c98
* Free the dibsection (HBITMAP) in PlatformBitmap's destructor, so we don't leak!reed@google.com2012-11-013-2/+9
| | | | | | | | | | | This adds an extra slot to PlatformBitmap, which is implemented for all platforms. To do this simply, an intptr_t field is added (platform_extra_) which is initialized to 0. At the moment, only the windows port uses this, but there is no cost to the other ports. BUG=158931 Review URL: https://codereview.chromium.org/11293036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165424 0039d316-1c4b-4281-b951-d872f2087c98
* android: Build android_tools_common target as static_library.tfarina@chromium.org2012-11-011-1/+1
| | | | | | | | | | BUG=111541 R=bulach@chromium.org Review URL: https://chromiumcodereview.appspot.com/11275079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165422 0039d316-1c4b-4281-b951-d872f2087c98
* [MIPS] Add build support in Skia for MIPS.petarj@mips.com2012-11-011-5/+16
| | | | | | | | | | | | Small change in skia.gyp to support building for MIPS arch. BUG= https://code.google.com/p/chromium/issues/detail?id=130022 TEST=make chrome Review URL: https://chromiumcodereview.appspot.com/11292003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165421 0039d316-1c4b-4281-b951-d872f2087c98
* First step towards component build for Android.yfriedman@chromium.org2012-11-0133-96/+137
| | | | | | | | | | Add symbol exports needed to build content shell. BUG=158821 Review URL: https://codereview.chromium.org/11368031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165420 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-03-03 10:13:13 +0000