Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2335 if (!frame->executeCommand(WebString::fromUTF8(it->name), | 2335 if (!frame->executeCommand(WebString::fromUTF8(it->name), |
| 2336 WebString::fromUTF8(it->value), | 2336 WebString::fromUTF8(it->value), |
| 2337 GetFocusedNode())) | 2337 GetFocusedNode())) |
| 2338 break; | 2338 break; |
| 2339 did_execute_command = true; | 2339 did_execute_command = true; |
| 2340 } | 2340 } |
| 2341 | 2341 |
| 2342 return did_execute_command; | 2342 return did_execute_command; |
| 2343 } | 2343 } |
| 2344 | 2344 |
| 2345 void RenderViewImpl::didScrollWithKeyboard(const WebKit::WebFloatSize& delta) { | |
| 2346 if (delta.height != 0.f) | |
|
jamesr
2013/06/10 23:48:31
the body of this if is more than one physical line
Jinsuk Kim
2013/06/11 04:53:18
Done.
| |
| 2347 compositor_->UpdateTopControlsStatePreservingConstraints( | |
| 2348 delta.height < 0.f ? cc::SHOWN : cc::HIDDEN, true); | |
| 2349 } | |
| 2350 | |
| 2345 WebKit::WebColorChooser* RenderViewImpl::createColorChooser( | 2351 WebKit::WebColorChooser* RenderViewImpl::createColorChooser( |
| 2346 WebKit::WebColorChooserClient* client, | 2352 WebKit::WebColorChooserClient* client, |
| 2347 const WebKit::WebColor& initial_color) { | 2353 const WebKit::WebColor& initial_color) { |
| 2348 RendererWebColorChooserImpl* color_chooser = | 2354 RendererWebColorChooserImpl* color_chooser = |
| 2349 new RendererWebColorChooserImpl(this, client); | 2355 new RendererWebColorChooserImpl(this, client); |
| 2350 color_chooser->Open(static_cast<SkColor>(initial_color)); | 2356 color_chooser->Open(static_cast<SkColor>(initial_color)); |
| 2351 return color_chooser; | 2357 return color_chooser; |
| 2352 } | 2358 } |
| 2353 | 2359 |
| 2354 bool RenderViewImpl::runFileChooser( | 2360 bool RenderViewImpl::runFileChooser( |
| (...skipping 4368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6723 WebURL url = icon_urls[i].iconURL(); | 6729 WebURL url = icon_urls[i].iconURL(); |
| 6724 if (!url.isEmpty()) | 6730 if (!url.isEmpty()) |
| 6725 urls.push_back(FaviconURL(url, | 6731 urls.push_back(FaviconURL(url, |
| 6726 ToFaviconType(icon_urls[i].iconType()))); | 6732 ToFaviconType(icon_urls[i].iconType()))); |
| 6727 } | 6733 } |
| 6728 SendUpdateFaviconURL(urls); | 6734 SendUpdateFaviconURL(urls); |
| 6729 } | 6735 } |
| 6730 | 6736 |
| 6731 | 6737 |
| 6732 } // namespace content | 6738 } // namespace content |
| OLD | NEW |