summaryrefslogtreecommitdiffstats
path: root/chrome
Commit message (Collapse)AuthorAgeFilesLines
* Action choice dialog should not auto-choose a remembered item when run with ↵mtomasz@chromium.org2013-03-267-10/+99
| | | | | | | | | | | | | | shift modifier pressed. The action choice dialog remembers the choice, so when an sd/usb with dcim folder is inserted again, then the remembered app is automatically started. This patch adds an option to avoid this auto-launching, and instead always showing the action choice dialog, when shift key is pressed. This is for power users. TEST=Enter sd/usb with dcim and choice Import to Drive. Hit 'Always'. Do this again with shift, and later without shift. BUG=222941 Review URL: https://chromiumcodereview.appspot.com/12880012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190625 0039d316-1c4b-4281-b951-d872f2087c98
* change empty clipboard part of disabled test to cros, rather than aurascottmg@chromium.org2013-03-261-2/+2
| | | | | | | | | | | | I think this test was meant to be CrOS. It doesn't cause any problem on non-CrOS aura afaict. TBR=pkasting@chromium.org R=shess@chromium.org BUG=133848 Review URL: https://chromiumcodereview.appspot.com/12865013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190624 0039d316-1c4b-4281-b951-d872f2087c98
* GeolocationAPIEmbedderHasAccess marked as FLAKYygorshenin@chromium.org2013-03-261-1/+1
| | | | | | | | | BUG=223877 TBR=erikkay@chromium.org Review URL: https://codereview.chromium.org/13087002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190622 0039d316-1c4b-4281-b951-d872f2087c98
* Add test for RWH::GetSnapshotFromRenderer.justinlin@chromium.org2013-03-261-69/+74
| | | | | | | | | | | Move pdf_browser test onto new snapshot method. BUG=223374 Review URL: https://chromiumcodereview.appspot.com/12947006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190620 0039d316-1c4b-4281-b951-d872f2087c98
* Retry failed dismiss requests:vadimt@chromium.org2013-03-262-46/+185
| | | | | | | | | | | | | | | | | If server request for a card dismiss fails, keep retrying till succeed. If there are pending (not yet succeeded) dismiss requests, we don’t try to retrieve new cards to avoid infinite growth of the peiding dismisses set. We also try to send pending dismisses each time before requesting new cards. Also, keep successfully dismissed cards for 20 min and filter received cards using this set. BUG=164227 TEST= 1. Show 2 cards; stop the server or otherwise break server connection; close both cards by clicking (a dismiss attempt should happen a closing each card); observe (2 times) that every 5 min we try to dismiss one of these cards; manually invoke updateNotificationsCards() and observe that this causes a dismissal ping, not the cards ping; reconnect to the server; make sure that dismiss requests are sent and succeed for both cards within 5 min; make sure that in 5 min dismiss retries don’t happen; wait till scheduled cards update happens and make sure it’s successful. 2. Run a fake server that provides 4 cards and successfully processes a dismiss request by returning success, but doing nothing; dismiss one card (A) and then in 5 min another card (B); force request for cards by manually calling updateNotificationsCards(); observe that all 4 cards cards are still sent by the server but the dismissed cards don’t reappear in Notification Center; when 19 min passes after dismissing (A), call updateNotificationsCards() with same expected results; in 21 from dismissing (A) min do this again and observe that (A) reappears; 24 min: same result; 26 min: - B reappears in addition to A and 2 non-dismissed cards. 3. Follow steps in test 1 up to ‘reconnect to the server’ step. Once reconnect, immediately manually execute updateNotificationsCards(). Observe that this will immediately send 2 successful dismiss request and a successful request for cards. Review URL: https://chromiumcodereview.appspot.com/12945005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190619 0039d316-1c4b-4281-b951-d872f2087c98
* [Instant] Fix in adjusting the Instant suggestionmathp@chromium.org2013-03-266-14/+63
| | | | | | | | | | | | Fixing the case where a keystroke would make the default suggestion change from type URL (with inline text) to type SEARCH. Now using |last_user_text_| to fix the suggestion. BUG=196694 Review URL: https://chromiumcodereview.appspot.com/12937002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190615 0039d316-1c4b-4281-b951-d872f2087c98
* Add nacl_arch to data we send in omaha update checks for extensions/componentsasargent@chromium.org2013-03-263-27/+57
| | | | | | | | | | | This is to support the webstore multi-crx feature BUG=180402 Review URL: https://chromiumcodereview.appspot.com/12928004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190614 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the cursor state of the hidden navigation dot.kmadhusu@chromium.org2013-03-261-0/+2
| | | | | | | | | | BUG=223348 TEST=none Review URL: https://chromiumcodereview.appspot.com/12924012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190611 0039d316-1c4b-4281-b951-d872f2087c98
* Updating trunk VERSION from 1453.0 to 1454.0chrome-release@google.com2013-03-261-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190609 0039d316-1c4b-4281-b951-d872f2087c98
* [win] Use launcher feedback page from launcher menubenwells@chromium.org2013-03-261-2/+3
| | | | | | | | | | | | | This change uses the AppLauncher categeory tag when showing the feedback page from the app launcher menu, which causes an app launcher specific version of the page to be shown. BUG=179474 Review URL: https://chromiumcodereview.appspot.com/12550021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190601 0039d316-1c4b-4281-b951-d872f2087c98
* Get OAuth2TokenService working on Android.dubroy@chromium.org2013-03-267-16/+247
| | | | | | | | | | | | | In order to get OAuth tokens on Android, we have to call out to Java. This CL makes it possible. It's not the ideal solution but works for now. BUG= 222271 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190531 Review URL: https://codereview.chromium.org/12880014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190600 0039d316-1c4b-4281-b951-d872f2087c98
* Cancel mid-word spelling requestsrouslan@chromium.org2013-03-262-1/+21
| | | | | | | | | | | | | Spelling markers disappear for all text while typing in the middle of a word, because the cached results are empty. This patch cancels such spelling requests, which preserves the spelling markers. BUG=223708 Review URL: https://chromiumcodereview.appspot.com/12869016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190597 0039d316-1c4b-4281-b951-d872f2087c98
* Extract input_method_whitelist.{h|cc} from c/b/chromeos.nona@chromium.org2013-03-2614-506/+7
| | | | | | | | | | | | This is part of extraction work for input method from chrome/browser/chromeos. BUG=164375 TEST=None TBR=sky Review URL: https://chromiumcodereview.appspot.com/12438012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190596 0039d316-1c4b-4281-b951-d872f2087c98
* Move perf data into its own Autotest Dep.sbasi@google.com2013-03-265-0/+63
| | | | | | | | | | | | | We are pushing perf data out of the telemetry dep as client side telemetry tests don't need these files and they are large. BUG=chromium:223237 TEST=built-locally. Review URL: https://chromiumcodereview.appspot.com/12865014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190595 0039d316-1c4b-4281-b951-d872f2087c98
* Images used in new design of OOBE/Login error screens.ygorshenin@chromium.org2013-03-265-0/+4
| | | | | | | | | BUG=179676 NOTRY=true Review URL: https://codereview.chromium.org/12976006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190591 0039d316-1c4b-4281-b951-d872f2087c98
* Implement local NTP for fallback.jeremycho@chromium.org2013-03-2614-21/+902
| | | | | | | | | BUG=178775 Review URL: https://chromiumcodereview.appspot.com/12840003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190589 0039d316-1c4b-4281-b951-d872f2087c98
* Upload dumped files for dmprof from Chrome Endure.dmikurube@chromium.org2013-03-261-14/+81
| | | | | | | | | | BUG=189157 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12834008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190588 0039d316-1c4b-4281-b951-d872f2087c98
* Don't show outdated install bubble for non-organic brand codes.mad@chromium.org2013-03-261-3/+11
| | | | | | | | | BUG=151996 Review URL: https://chromiumcodereview.appspot.com/12827036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190587 0039d316-1c4b-4281-b951-d872f2087c98
* Make manager-based flow default.antrim@chromium.org2013-03-2615-156/+37
| | | | | | | | | BUG=176277 TBR=nkostylev@chromium.org, derat@chromium.org Review URL: https://chromiumcodereview.appspot.com/12742011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190586 0039d316-1c4b-4281-b951-d872f2087c98
* Alternate NTP Mac: Show overlay at fixed positionsail@chromium.org2013-03-2618-82/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the overlay was shown at the bottom of the toolbar. The height of the bookmark bar changes if the bookmark bar is attached. This meant that the overlay would change positions (relative to the omnibox) depending on the bookmark bar's attached state. With this CL we now show the overlay at the fixed offset from the omnibox. One side effect of this is that the bottom of the toolbar can no longer act as a separator for the overlay. I've changed the overlay to draw its own separator. Screenshot: http://i.imgur.com/ub9gfDo.png BUG=173475, 174077 TBR=sky@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190213 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190519 Review URL: https://chromiumcodereview.appspot.com/12674019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190584 0039d316-1c4b-4281-b951-d872f2087c98
* Switch Next Window Key functionalityharrym@chromium.org2013-03-263-3/+3
| | | | | | | | | | | | | Switches the next window button on chromeos (f5) to act the same as alt-tab/shift-alt-tab BUG=174035 TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/12618014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190579 0039d316-1c4b-4281-b951-d872f2087c98
* Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence.simonjam@chromium.org2013-03-262-2/+3
| | | | | | | | | | | | | | The scope indicates how long the vertical line should be in the tracing UI. It can be global (full screen), process or thread (fill those tracks), or local (the original style for INSTANT). BUG=None Review URL: https://chromiumcodereview.appspot.com/12252058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190577 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] Don't load -pasteAndGo: menu entry which will be bounced.shess@chromium.org2013-03-261-8/+10
| | | | | | | | | | | | | | | AutocompleteTextfieldEditor implements guards in -paste: and -pasteAndGo: to prevent pasting in giant texts. Modify the right-click menu to not load -pasteAndGo: if it's going to be bounced anyhow. BUG=214622 TEST=Generate large clipboard, right-click omnibox, check for "Paste and Go" item. Review URL: https://chromiumcodereview.appspot.com/12544034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190574 0039d316-1c4b-4281-b951-d872f2087c98
* Generate Android string files from generated_resources.grd.newt@chromium.org2013-03-263-48/+99
| | | | | | | | | | | | | | This enables Android layouts and Java code to use strings from generated_resources.grd directly. Strings tagged with formatter_data="android_java" in generated_resources.grd are used to produce an Android strings xml file. BUG=176069 Review URL: https://chromiumcodereview.appspot.com/12529025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190573 0039d316-1c4b-4281-b951-d872f2087c98
* Init LoginUtilsImpl::session_restore_strategy_stevenjb@chromium.org2013-03-261-0/+2
| | | | | | | | | BUG=223804 Review URL: https://chromiumcodereview.appspot.com/12521024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190572 0039d316-1c4b-4281-b951-d872f2087c98
* Added activity logging for ext APIs with custom bindingsfelt@chromium.org2013-03-2613-7/+222
| | | | | | | | | | | The Activity Log wasn't catching chrome.* API calls if they went through custom bindings. This CL fixes that and adds a test case. BUG=39802 Review URL: https://chromiumcodereview.appspot.com/12517011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190571 0039d316-1c4b-4281-b951-d872f2087c98
* Move Requirements out of Extension Classrdevlin.cronin@chromium.org2013-03-2614-156/+274
| | | | | | | | | | | TBR=ben@chromium.org, mirandac@chromium.org, pam@chromium.org (ben - gypis, mirandac - profiles, pam - managed_mode) BUG=159265 Review URL: https://chromiumcodereview.appspot.com/12494028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190570 0039d316-1c4b-4281-b951-d872f2087c98
* Update whitelist for Screen Capture APIsergeyu@chromium.org2013-03-261-2/+10
| | | | | | | | BUG=134249 Review URL: https://chromiumcodereview.appspot.com/12967015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190567 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: extract ADB command classes, change objects' lifetimespfeldman@chromium.org2013-03-267-403/+503
| | | | | | | | TBR=jhawkins (for minor webui changes) Review URL: https://codereview.chromium.org/12586010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190564 0039d316-1c4b-4281-b951-d872f2087c98
* chromeos: Fix inappropriate NULL check in AddDriveMountPointhashimoto@chromium.org2013-03-261-2/+2
| | | | | | | | BUG=None Review URL: https://codereview.chromium.org/12811017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190562 0039d316-1c4b-4281-b951-d872f2087c98
* Fix data overwriting issue on ReadFromDownloadData.hidehiko@chromium.org2013-03-262-25/+41
| | | | | | | | | | | | There is an issue which overwrites the download_data_ if the pending data is not yet consumed. This CL fixes it. BUG=223603 TEST=Ran unit_tests and tested manually. Review URL: https://codereview.chromium.org/13065007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190561 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 190531 "Get OAuth2TokenService working on Android."hashimoto@chromium.org2013-03-267-256/+18
| | | | | | | | | | | | | | | | > Get OAuth2TokenService working on Android. > > In order to get OAuth tokens on Android, we have to call out to Java. This CL > makes it possible. It's not the ideal solution but works for now. > > BUG= 222271 > > Review URL: https://codereview.chromium.org/12880014 TBR=dubroy@chromium.org Review URL: https://codereview.chromium.org/12782018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190558 0039d316-1c4b-4281-b951-d872f2087c98
* Removed the OK button from the action choice dialog.mtomasz@chromium.org2013-03-263-30/+9
| | | | | | | | | | | The OK button has been removed and since now, selected app is launched on click/touch. TEST=Enter a sd/usb with dcim folder. BUG=222941 Review URL: https://codereview.chromium.org/12913023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190557 0039d316-1c4b-4281-b951-d872f2087c98
* Method to get Media Galleries handlers in MediaGalleriesPrivateApi.mtomasz@chromium.org2013-03-264-1/+86
| | | | | | | | | | | For the gatekeeper, we need list of media galleries handlers to know what to display in the action choice dialog. This patch adds a method whih returns such lists via a asynchronous call to chrome.mediaGalleriesPrivate.getHandlers. TEST=Tested manually. Not in production, yet. BUG=222565 Review URL: https://codereview.chromium.org/13063004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190556 0039d316-1c4b-4281-b951-d872f2087c98
* chromeos: Use RefreshEntry to implement DriveResourceMetadata::RenameEntryhashimoto@chromium.org2013-03-261-11/+3
| | | | | | | | | BUG=None TEST=unit_tests Review URL: https://codereview.chromium.org/12907012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190555 0039d316-1c4b-4281-b951-d872f2087c98
* Fix ChangeListLoader's callback invocation.kinaba@chromium.org2013-03-262-14/+28
| | | | | | | | | | | In some corner cases, it might have not invoked pending callback tasks, or it invoked them too early before all feeds are ready. BUG=223517 Review URL: https://codereview.chromium.org/13079006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190554 0039d316-1c4b-4281-b951-d872f2087c98
* Remove retrial of reading from a cached file.hidehiko@chromium.org2013-03-262-32/+18
| | | | | | | | | | | | The retry function has an issue that breaks the buffer content. Seems like it is not necessary, so just clean it up. BUG=223603 TEST=Ran unit_tests and tested manually. Review URL: https://codereview.chromium.org/13078005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190553 0039d316-1c4b-4281-b951-d872f2087c98
* Support FD passing for NaCl on posixhamaji@chromium.org2013-03-261-5/+10
| | | | | | | | | | | | We need this to make GetOSFileDescriptor work from NaCl module. R=bradchen@chromium.org, bradnelson@chromium.org, bbudge@chromium.org BUG=183015 TEST=locally tested with modified examples/file_io and https://codereview.chromium.org/13032002/. The 13032002 will also test this change as the test modified in 13032002 seems to run on NaCl Review URL: https://codereview.chromium.org/13011002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190552 0039d316-1c4b-4281-b951-d872f2087c98
* chromeos: In DriveResourceMetadata::RefreshEntry, reject entry with root ↵hashimoto@chromium.org2013-03-262-0/+16
| | | | | | | | | | | resource id if it has parent BUG=None TEST=unit_tests Review URL: https://codereview.chromium.org/12905010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190548 0039d316-1c4b-4281-b951-d872f2087c98
* In ~ExtensionHost, close swapped-out RenderViews referring to this extension.jyasskin@chromium.org2013-03-261-0/+9
| | | | | | | | | | | | I don't think this is the ideal fix, but it works, and I don't think I can get the real fix debugged by the M27 branch. BUG=178542 TEST=Use the instructions at http://crbug.com/178542#c16 Review URL: https://codereview.chromium.org/13067002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190543 0039d316-1c4b-4281-b951-d872f2087c98
* Add delete context menu for custom wallpapers and some ui tweaksbshe@chromium.org2013-03-2611-34/+153
| | | | | | | | BUG=177691 Review URL: https://codereview.chromium.org/12769017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190540 0039d316-1c4b-4281-b951-d872f2087c98
* Add display scaling and rotation shortcuts to keyboard overlay.mazda@chromium.org2013-03-264-9/+61
| | | | | | | | | | | | Ctrl-Shift-Back -> Scale down UI Ctrl-Shift-Foward -> Scale up UI Ctrl-Shift-Reload -> Rotate screen BUG=196817 Review URL: https://codereview.chromium.org/12617019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190538 0039d316-1c4b-4281-b951-d872f2087c98
* [chromedriver] Fix 3 bugs about web view, window handle and target window.chrisgao@chromium.org2013-03-2611-96/+137
| | | | | | | | | | | Main change is the interface of chrome.h BUG=chromedriver:241, chromedriver:248, chromedriver:254 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12978003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190537 0039d316-1c4b-4281-b951-d872f2087c98
* SyncFS: -1 GDataErrorCode should be handled gracefullykinuko@chromium.org2013-03-261-1/+9
| | | | | | | | | | | | | | GData service code seems to occasionally return -1 when network is unavailable. BUG=223042 TEST=manual NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12916010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190536 0039d316-1c4b-4281-b951-d872f2087c98
* Cancel drag upon screen lock.oshima@chromium.org2013-03-261-1/+6
| | | | | | | | | | | I believe cancel upon capture lost is necessary regardless. BUG=175486 TEST=covered by tests, manually on lock screen. Review URL: https://codereview.chromium.org/13041002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190534 0039d316-1c4b-4281-b951-d872f2087c98
* Get OAuth2TokenService working on Android.dubroy@chromium.org2013-03-267-18/+256
| | | | | | | | | | | In order to get OAuth tokens on Android, we have to call out to Java. This CL makes it possible. It's not the ideal solution but works for now. BUG= 222271 Review URL: https://codereview.chromium.org/12880014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190531 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 190519 "Alternate NTP Mac: Show overlay at fixed position"sail@chromium.org2013-03-2618-212/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Alternate NTP Mac: Show overlay at fixed position > > Previously the overlay was shown at the bottom of the toolbar. The height of > the bookmark bar changes if the bookmark bar is attached. This meant that the > overlay would change positions (relative to the omnibox) depending on the > bookmark bar's attached state. > > With this CL we now show the overlay at the fixed offset from the omnibox. > > One side effect of this is that the bottom of the toolbar can no longer act > as a separator for the overlay. I've changed the overlay to draw its own > separator. > > Screenshot: http://i.imgur.com/ub9gfDo.png > > BUG=173475, 174077 > TBR=sky@chromium.org > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=190213 > > Review URL: https://codereview.chromium.org/12674019 TBR=sail@chromium.org Review URL: https://codereview.chromium.org/12905008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190530 0039d316-1c4b-4281-b951-d872f2087c98
* Update Java version metadata for CVE-2013-1493.cevans@chromium.org2013-03-262-8/+8
| | | | | | | BUG=223791 Review URL: https://codereview.chromium.org/12941012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190529 0039d316-1c4b-4281-b951-d872f2087c98
* Files.app: prevent unlimited recursive directory traversalyoshiki@chromium.org2013-03-261-1/+8
| | | | | | | | | | | | | Previously, a directory traversal on the left directory tree is not limited because of a wrong condition. This patch fixes it. BUG=none TEST=manual TBR=kinaba@chromium.org NOTRY=True Review URL: https://chromiumcodereview.appspot.com/12683006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190522 0039d316-1c4b-4281-b951-d872f2087c98
* SyncFS: Fix up DCHECK failureskinuko@chromium.org2013-03-261-2/+1
| | | | | | | | | | | | | | | | | 1. After r190443 now we may call UploadNewFileForLocalSync even for the files we have (stale) metadata 2. In auto conflict resolution we could have metadata that doesn't have resource_id in metadata_store while having a remote change for the file (thus resulting in a conflict) BUG=177626,223415 TEST=manual NOTRY=true Review URL: https://chromiumcodereview.appspot.com/12660020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190521 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-16 03:50:07 +0000