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

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

Issue 7399030: Remove --enable-p2papi flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 5 months 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/common/content_switches.cc ('k') | no next file » | 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.h" 5 #include "content/renderer/render_view.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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 394
395 OnSetRendererPrefs(renderer_prefs); 395 OnSetRendererPrefs(renderer_prefs);
396 396
397 host_window_ = parent_hwnd; 397 host_window_ = parent_hwnd;
398 398
399 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 399 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
400 if (command_line.HasSwitch(switches::kEnableAccessibility)) 400 if (command_line.HasSwitch(switches::kEnableAccessibility))
401 WebAccessibilityCache::enableAccessibility(); 401 WebAccessibilityCache::enableAccessibility();
402 402
403 #if defined(ENABLE_P2P_APIS) 403 #if defined(ENABLE_P2P_APIS)
404 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableP2PApi)) 404 p2p_socket_dispatcher_ = new P2PSocketDispatcher(this);
405 p2p_socket_dispatcher_ = new P2PSocketDispatcher(this);
406 #endif 405 #endif
407 406
408 content::GetContentClient()->renderer()->RenderViewCreated(this); 407 content::GetContentClient()->renderer()->RenderViewCreated(this);
409 } 408 }
410 409
411 RenderView::~RenderView() { 410 RenderView::~RenderView() {
412 history_page_ids_.clear(); 411 history_page_ids_.clear();
413 412
414 if (decrement_shared_popup_at_destruction_) 413 if (decrement_shared_popup_at_destruction_)
415 shared_popup_counter_->data--; 414 shared_popup_counter_->data--;
(...skipping 3884 matching lines...) Expand 10 before | Expand all | Expand 10 after
4300 } 4299 }
4301 #endif 4300 #endif
4302 4301
4303 void RenderView::OnContextMenuClosed( 4302 void RenderView::OnContextMenuClosed(
4304 const webkit_glue::CustomContextMenuContext& custom_context) { 4303 const webkit_glue::CustomContextMenuContext& custom_context) {
4305 if (custom_context.is_pepper_menu) 4304 if (custom_context.is_pepper_menu)
4306 pepper_delegate_.OnContextMenuClosed(custom_context); 4305 pepper_delegate_.OnContextMenuClosed(custom_context);
4307 else 4306 else
4308 context_menu_node_.reset(); 4307 context_menu_node_.reset();
4309 } 4308 }
OLDNEW
« no previous file with comments | « content/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698