| 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 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 OnEnableAutoResize(params->min_size, params->max_size); | 798 OnEnableAutoResize(params->min_size, params->max_size); |
| 799 } | 799 } |
| 800 | 800 |
| 801 new MHTMLGenerator(this); | 801 new MHTMLGenerator(this); |
| 802 #if defined(OS_MACOSX) | 802 #if defined(OS_MACOSX) |
| 803 new TextInputClientObserver(this); | 803 new TextInputClientObserver(this); |
| 804 #endif // defined(OS_MACOSX) | 804 #endif // defined(OS_MACOSX) |
| 805 | 805 |
| 806 // The next group of objects all implement RenderViewObserver, so are deleted | 806 // The next group of objects all implement RenderViewObserver, so are deleted |
| 807 // along with the RenderView automatically. | 807 // along with the RenderView automatically. |
| 808 devtools_agent_ = new DevToolsAgent(this); | 808 devtools_agent_ = new DevToolsAgent(main_render_frame_.get()); |
| 809 if (RenderWidgetCompositor* rwc = compositor()) { | 809 if (RenderWidgetCompositor* rwc = compositor()) { |
| 810 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); | 810 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); |
| 811 } | 811 } |
| 812 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this); | 812 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this); |
| 813 | 813 |
| 814 history_controller_.reset(new HistoryController(this)); | 814 history_controller_.reset(new HistoryController(this)); |
| 815 | 815 |
| 816 new IdleUserDetector(this); | 816 new IdleUserDetector(this); |
| 817 | 817 |
| 818 if (command_line.HasSwitch(switches::kDomAutomationController)) | 818 if (command_line.HasSwitch(switches::kDomAutomationController)) |
| (...skipping 3410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4229 std::vector<gfx::Size> sizes; | 4229 std::vector<gfx::Size> sizes; |
| 4230 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4230 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 4231 if (!url.isEmpty()) | 4231 if (!url.isEmpty()) |
| 4232 urls.push_back( | 4232 urls.push_back( |
| 4233 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4233 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 4234 } | 4234 } |
| 4235 SendUpdateFaviconURL(urls); | 4235 SendUpdateFaviconURL(urls); |
| 4236 } | 4236 } |
| 4237 | 4237 |
| 4238 } // namespace content | 4238 } // namespace content |
| OLD | NEW |