Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1546)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 8934011: Rename IntentsHost -> WebIntentsDispatcher and IntentsDispatcher -> WebIntentsHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/web_intents_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "content/public/renderer/document_state.h" 47 #include "content/public/renderer/document_state.h"
48 #include "content/public/renderer/navigation_state.h" 48 #include "content/public/renderer/navigation_state.h"
49 #include "content/public/renderer/render_view_observer.h" 49 #include "content/public/renderer/render_view_observer.h"
50 #include "content/public/renderer/render_view_visitor.h" 50 #include "content/public/renderer/render_view_visitor.h"
51 #include "content/renderer/device_orientation_dispatcher.h" 51 #include "content/renderer/device_orientation_dispatcher.h"
52 #include "content/renderer/devtools_agent.h" 52 #include "content/renderer/devtools_agent.h"
53 #include "content/renderer/external_popup_menu.h" 53 #include "content/renderer/external_popup_menu.h"
54 #include "content/renderer/geolocation_dispatcher.h" 54 #include "content/renderer/geolocation_dispatcher.h"
55 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" 55 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
56 #include "content/renderer/idle_user_detector.h" 56 #include "content/renderer/idle_user_detector.h"
57 #include "content/renderer/intents_dispatcher.h" 57 #include "content/renderer/web_intents_host.h"
58 #include "content/renderer/java/java_bridge_dispatcher.h" 58 #include "content/renderer/java/java_bridge_dispatcher.h"
59 #include "content/renderer/load_progress_tracker.h" 59 #include "content/renderer/load_progress_tracker.h"
60 #include "content/renderer/media/audio_message_filter.h" 60 #include "content/renderer/media/audio_message_filter.h"
61 #include "content/renderer/media/audio_renderer_impl.h" 61 #include "content/renderer/media/audio_renderer_impl.h"
62 #include "content/renderer/media/media_stream_impl.h" 62 #include "content/renderer/media/media_stream_impl.h"
63 #include "content/renderer/media/render_media_log.h" 63 #include "content/renderer/media/render_media_log.h"
64 #include "content/renderer/mhtml_generator.h" 64 #include "content/renderer/mhtml_generator.h"
65 #include "content/renderer/notification_provider.h" 65 #include "content/renderer/notification_provider.h"
66 #include "content/renderer/p2p/socket_dispatcher.h" 66 #include "content/renderer/p2p/socket_dispatcher.h"
67 #include "content/renderer/plugin_channel_host.h" 67 #include "content/renderer/plugin_channel_host.h"
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 384
385 if (counter) { 385 if (counter) {
386 shared_popup_counter_ = counter; 386 shared_popup_counter_ = counter;
387 shared_popup_counter_->data++; 387 shared_popup_counter_->data++;
388 decrement_shared_popup_at_destruction_ = true; 388 decrement_shared_popup_at_destruction_ = true;
389 } else { 389 } else {
390 shared_popup_counter_ = new SharedRenderViewCounter(0); 390 shared_popup_counter_ = new SharedRenderViewCounter(0);
391 decrement_shared_popup_at_destruction_ = false; 391 decrement_shared_popup_at_destruction_ = false;
392 } 392 }
393 393
394 intents_dispatcher_ = new IntentsDispatcher(this); 394 intents_host_ = new WebIntentsHost(this);
395 395
396 RenderThread::Get()->AddRoute(routing_id_, this); 396 RenderThread::Get()->AddRoute(routing_id_, this);
397 // Take a reference on behalf of the RenderThread. This will be balanced 397 // Take a reference on behalf of the RenderThread. This will be balanced
398 // when we receive ViewMsg_ClosePage. 398 // when we receive ViewMsg_ClosePage.
399 AddRef(); 399 AddRef();
400 400
401 // If this is a popup, we must wait for the CreatingNew_ACK message before 401 // If this is a popup, we must wait for the CreatingNew_ACK message before
402 // completing initialization. Otherwise, we can finish it now. 402 // completing initialization. Otherwise, we can finish it now.
403 if (opener_id == MSG_ROUTING_NONE) { 403 if (opener_id == MSG_ROUTING_NONE) {
404 did_show_ = true; 404 did_show_ = true;
(...skipping 4389 matching lines...) Expand 10 before | Expand all | Expand 10 after
4794 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 4794 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4795 return !!RenderThreadImpl::current()->compositor_thread(); 4795 return !!RenderThreadImpl::current()->compositor_thread();
4796 } 4796 }
4797 4797
4798 void RenderViewImpl::OnJavaBridgeInit() { 4798 void RenderViewImpl::OnJavaBridgeInit() {
4799 DCHECK(!java_bridge_dispatcher_.get()); 4799 DCHECK(!java_bridge_dispatcher_.get());
4800 #if defined(ENABLE_JAVA_BRIDGE) 4800 #if defined(ENABLE_JAVA_BRIDGE)
4801 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 4801 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
4802 #endif 4802 #endif
4803 } 4803 }
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/web_intents_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698