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

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

Issue 100118: plugins: Some obvious ifdef removals (code that previously wouldn't link). (Closed)
Patch Set: better patch Created 11 years, 7 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
« no previous file with comments | « chrome/browser/plugin_process_host.cc ('k') | webkit/glue/webplugin_impl.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 250
251 void RenderView::PluginDestroyed(WebPluginDelegateProxy* proxy) { 251 void RenderView::PluginDestroyed(WebPluginDelegateProxy* proxy) {
252 PluginDelegateList::iterator it = 252 PluginDelegateList::iterator it =
253 std::find(plugin_delegates_.begin(), plugin_delegates_.end(), proxy); 253 std::find(plugin_delegates_.begin(), plugin_delegates_.end(), proxy);
254 DCHECK(it != plugin_delegates_.end()); 254 DCHECK(it != plugin_delegates_.end());
255 plugin_delegates_.erase(it); 255 plugin_delegates_.erase(it);
256 // If the plugin is deleted, we need to clear our reference in case user 256 // If the plugin is deleted, we need to clear our reference in case user
257 // clicks the info bar to install. Unfortunately we are getting 257 // clicks the info bar to install. Unfortunately we are getting
258 // PluginDestroyed in single process mode. However, that is not a huge 258 // PluginDestroyed in single process mode. However, that is not a huge
259 // concern. 259 // concern.
260 #if defined(OS_WIN)
261 if (proxy == first_default_plugin_) 260 if (proxy == first_default_plugin_)
262 first_default_plugin_ = NULL; 261 first_default_plugin_ = NULL;
263 #else
264 // TODO(port): because of the headers that we aren't including, the compiler
265 // has only seen a forward decl, not the subclass relation. Thus it doesn't
266 // know that the two pointer types compared above are comparable. Once we
267 // port and include the headers this problem should go away.
268 NOTIMPLEMENTED();
269 #endif
270 } 262 }
271 263
272 void RenderView::PluginCrashed(const FilePath& plugin_path) { 264 void RenderView::PluginCrashed(const FilePath& plugin_path) {
273 Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path)); 265 Send(new ViewHostMsg_CrashedPlugin(routing_id_, plugin_path));
274 } 266 }
275 267
276 268
277 void RenderView::JSOutOfMemory() { 269 void RenderView::JSOutOfMemory() {
278 Send(new ViewHostMsg_JSOutOfMemory(routing_id_)); 270 Send(new ViewHostMsg_JSOutOfMemory(routing_id_));
279 } 271 }
(...skipping 2727 matching lines...) Expand 10 before | Expand all | Expand 10 after
3007 } 2999 }
3008 } 3000 }
3009 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinishDoc", start_to_finish_doc); 3001 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinishDoc", start_to_finish_doc);
3010 UMA_HISTOGRAM_TIMES("Renderer.All.FinishDocToFinish", finish_doc_to_finish); 3002 UMA_HISTOGRAM_TIMES("Renderer.All.FinishDocToFinish", finish_doc_to_finish);
3011 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinish", start_to_finish); 3003 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinish", start_to_finish);
3012 if (start_to_first_layout.ToInternalValue() >= 0) { 3004 if (start_to_first_layout.ToInternalValue() >= 0) {
3013 UMA_HISTOGRAM_TIMES( 3005 UMA_HISTOGRAM_TIMES(
3014 "Renderer.All.StartToFirstLayout", start_to_first_layout); 3006 "Renderer.All.StartToFirstLayout", start_to_first_layout);
3015 } 3007 }
3016 } 3008 }
OLDNEW
« no previous file with comments | « chrome/browser/plugin_process_host.cc ('k') | webkit/glue/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698