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

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

Issue 100195: Enable video in linux build and remove unneeded ifdefs to guard windows. (Closed)
Patch Set: Fix inifite loop. 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 | « no previous file | chrome/renderer/webmediaplayer_delegate_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 1859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 1870
1871 return proxy; 1871 return proxy;
1872 #else 1872 #else
1873 // TODO(port): Plugins currently not supported 1873 // TODO(port): Plugins currently not supported
1874 NOTIMPLEMENTED(); 1874 NOTIMPLEMENTED();
1875 return NULL; 1875 return NULL;
1876 #endif 1876 #endif
1877 } 1877 }
1878 1878
1879 webkit_glue::WebMediaPlayerDelegate* RenderView::CreateMediaPlayerDelegate() { 1879 webkit_glue::WebMediaPlayerDelegate* RenderView::CreateMediaPlayerDelegate() {
1880 #if defined(OS_WIN)
1881 return new WebMediaPlayerDelegateImpl(this); 1880 return new WebMediaPlayerDelegateImpl(this);
1882 #else
1883 // TODO(port)
1884 NOTIMPLEMENTED();
1885 return NULL;
1886 #endif
1887 } 1881 }
1888 1882
1889 void RenderView::OnMissingPluginStatus(WebPluginDelegate* delegate, 1883 void RenderView::OnMissingPluginStatus(WebPluginDelegate* delegate,
1890 int status) { 1884 int status) {
1891 #if defined(OS_WIN) 1885 #if defined(OS_WIN)
1892 if (first_default_plugin_ == NULL) { 1886 if (first_default_plugin_ == NULL) {
1893 // Show the InfoBar for the first available plugin. 1887 // Show the InfoBar for the first available plugin.
1894 if (status == default_plugin::MISSING_PLUGIN_AVAILABLE) { 1888 if (status == default_plugin::MISSING_PLUGIN_AVAILABLE) {
1895 first_default_plugin_ = delegate; 1889 first_default_plugin_ = delegate;
1896 Send(new ViewHostMsg_MissingPluginStatus(routing_id_, status)); 1890 Send(new ViewHostMsg_MissingPluginStatus(routing_id_, status));
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
2982 } 2976 }
2983 } 2977 }
2984 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinishDoc", start_to_finish_doc); 2978 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinishDoc", start_to_finish_doc);
2985 UMA_HISTOGRAM_TIMES("Renderer.All.FinishDocToFinish", finish_doc_to_finish); 2979 UMA_HISTOGRAM_TIMES("Renderer.All.FinishDocToFinish", finish_doc_to_finish);
2986 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinish", start_to_finish); 2980 UMA_HISTOGRAM_TIMES("Renderer.All.StartToFinish", start_to_finish);
2987 if (start_to_first_layout.ToInternalValue() >= 0) { 2981 if (start_to_first_layout.ToInternalValue() >= 0) {
2988 UMA_HISTOGRAM_TIMES( 2982 UMA_HISTOGRAM_TIMES(
2989 "Renderer.All.StartToFirstLayout", start_to_first_layout); 2983 "Renderer.All.StartToFirstLayout", start_to_first_layout);
2990 } 2984 }
2991 } 2985 }
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/webmediaplayer_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698