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

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

Issue 8804006: Reland 8688002: PPB_TCPSocket_Private/PPB_UDPSocket_Private are exposed to Browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder memebers 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
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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 page_id_(-1), 347 page_id_(-1),
348 last_page_id_sent_to_browser_(-1), 348 last_page_id_sent_to_browser_(-1),
349 history_list_offset_(-1), 349 history_list_offset_(-1),
350 history_list_length_(0), 350 history_list_length_(0),
351 target_url_status_(TARGET_NONE), 351 target_url_status_(TARGET_NONE),
352 selection_text_offset_(0), 352 selection_text_offset_(0),
353 cached_is_main_frame_pinned_to_left_(false), 353 cached_is_main_frame_pinned_to_left_(false),
354 cached_is_main_frame_pinned_to_right_(false), 354 cached_is_main_frame_pinned_to_right_(false),
355 cached_has_main_frame_horizontal_scrollbar_(false), 355 cached_has_main_frame_horizontal_scrollbar_(false),
356 cached_has_main_frame_vertical_scrollbar_(false), 356 cached_has_main_frame_vertical_scrollbar_(false),
357 ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)),
358 #if defined(OS_WIN)
359 focused_plugin_id_(-1),
360 #endif
361 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)), 357 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
362 geolocation_dispatcher_(NULL), 358 geolocation_dispatcher_(NULL),
363 speech_input_dispatcher_(NULL), 359 speech_input_dispatcher_(NULL),
364 device_orientation_dispatcher_(NULL), 360 device_orientation_dispatcher_(NULL),
365 p2p_socket_dispatcher_(NULL), 361 p2p_socket_dispatcher_(NULL),
366 devtools_agent_(NULL), 362 devtools_agent_(NULL),
367 renderer_accessibility_(NULL), 363 renderer_accessibility_(NULL),
368 session_storage_namespace_id_(session_storage_namespace_id), 364 session_storage_namespace_id_(session_storage_namespace_id),
369 handling_select_range_(false) { 365 handling_select_range_(false),
366 #if defined(OS_WIN)
367 focused_plugin_id_(-1),
368 #endif
369 ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)) {
370 routing_id_ = routing_id; 370 routing_id_ = routing_id;
371 if (opener_id != MSG_ROUTING_NONE) 371 if (opener_id != MSG_ROUTING_NONE)
372 opener_id_ = opener_id; 372 opener_id_ = opener_id;
373 373
374 #if defined(ENABLE_NOTIFICATIONS) 374 #if defined(ENABLE_NOTIFICATIONS)
375 notification_provider_ = new NotificationProvider(this); 375 notification_provider_ = new NotificationProvider(this);
376 #else 376 #else
377 notification_provider_ = NULL; 377 notification_provider_ = NULL;
378 #endif 378 #endif
379 379
(...skipping 4409 matching lines...) Expand 10 before | Expand all | Expand 10 after
4789 return !!RenderThreadImpl::current()->compositor_thread(); 4789 return !!RenderThreadImpl::current()->compositor_thread();
4790 } 4790 }
4791 4791
4792 void RenderViewImpl::OnJavaBridgeInit( 4792 void RenderViewImpl::OnJavaBridgeInit(
4793 const IPC::ChannelHandle& channel_handle) { 4793 const IPC::ChannelHandle& channel_handle) {
4794 DCHECK(!java_bridge_dispatcher_.get()); 4794 DCHECK(!java_bridge_dispatcher_.get());
4795 #if defined(ENABLE_JAVA_BRIDGE) 4795 #if defined(ENABLE_JAVA_BRIDGE)
4796 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4796 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4797 #endif 4797 #endif
4798 } 4798 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698