diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 22:26:43 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 22:26:43 +0000 |
| commit | 3541098cf0e583a4fbe72c50a19ae86a770f7ea8 (patch) | |
| tree | 93dd0220bfea60c022ddd88d30b74795f23b1fe5 /chrome/renderer/searchbox | |
| parent | cea54ee919ff03ebbc5c2a88881e4f1cc6edc235 (diff) | |
| download | chromium_src-3541098cf0e583a4fbe72c50a19ae86a770f7ea8.zip chromium_src-3541098cf0e583a4fbe72c50a19ae86a770f7ea8.tar.gz chromium_src-3541098cf0e583a4fbe72c50a19ae86a770f7ea8.tar.bz2 | |
Many InstantExtended manual tests fail on Mac
Fixes flake and timeouts of InstantExtendedManualTest.* on Mac.
BUG=225517
TEST=InstantExtendedManualTest.*
R=jered@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14125002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/searchbox')
| -rw-r--r-- | chrome/renderer/searchbox/searchbox_extension.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index 9caaf26..8326404 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -593,10 +593,11 @@ v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetAutocompleteResults( content::RenderView* render_view = GetRenderView(); if (!render_view) return v8::Undefined(); - DVLOG(1) << render_view << " GetAutocompleteResults"; std::vector<InstantAutocompleteResultIDPair> results; SearchBox::Get(render_view)->GetAutocompleteResults(&results); + DVLOG(1) << render_view << " GetAutocompleteResults: " << results.size(); + v8::Handle<v8::Array> results_array = v8::Array::New(results.size()); for (size_t i = 0; i < results.size(); ++i) { v8::Handle<v8::Object> result = v8::Object::New(); @@ -920,8 +921,9 @@ v8::Handle<v8::Value> SearchBoxExtensionWrapper::SetSuggestion( content::RenderView* render_view = GetRenderView(); if (!render_view || args.Length() < 2) return v8::Undefined(); - DVLOG(1) << render_view << " SetSuggestion"; string16 text = V8ValueToUTF16(args[0]); + DVLOG(1) << render_view << " SetSuggestion: " << text; + InstantCompleteBehavior behavior = INSTANT_COMPLETE_NOW; InstantSuggestionType type = INSTANT_SUGGESTION_URL; @@ -1035,14 +1037,14 @@ v8::Handle<v8::Value> SearchBoxExtensionWrapper::ShowOverlay( content::RenderView* render_view = GetRenderView(); if (!render_view || args.Length() < 1) return v8::Undefined(); - DVLOG(1) << render_view << " ShowOverlay"; - int height = 100; InstantSizeUnits units = INSTANT_SIZE_PERCENT; if (args[0]->IsInt32()) { height = args[0]->Int32Value(); units = INSTANT_SIZE_PIXELS; } + DVLOG(1) << render_view << " ShowOverlay: " << height << "/" << units; + SearchBox::Get(render_view)->ShowInstantOverlay(height, units); return v8::Undefined(); |