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

Side by Side Diff: content/plugin/plugin_thread.cc

Issue 630803002: Replace OVERRIDE and FINAL with override and final in content/plugin/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/plugin/plugin_thread.h" 5 #include "content/plugin/plugin_thread.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #if defined(OS_MACOSX) 9 #if defined(OS_MACOSX)
10 #include <CoreFoundation/CoreFoundation.h> 10 #include <CoreFoundation/CoreFoundation.h>
(...skipping 24 matching lines...) Expand all
35 namespace { 35 namespace {
36 36
37 class EnsureTerminateMessageFilter : public IPC::MessageFilter { 37 class EnsureTerminateMessageFilter : public IPC::MessageFilter {
38 public: 38 public:
39 EnsureTerminateMessageFilter() {} 39 EnsureTerminateMessageFilter() {}
40 40
41 protected: 41 protected:
42 virtual ~EnsureTerminateMessageFilter() {} 42 virtual ~EnsureTerminateMessageFilter() {}
43 43
44 // IPC::MessageFilter: 44 // IPC::MessageFilter:
45 virtual void OnChannelError() OVERRIDE { 45 virtual void OnChannelError() override {
46 // How long we wait before forcibly shutting down the process. 46 // How long we wait before forcibly shutting down the process.
47 const base::TimeDelta kPluginProcessTerminateTimeout = 47 const base::TimeDelta kPluginProcessTerminateTimeout =
48 base::TimeDelta::FromSeconds(3); 48 base::TimeDelta::FromSeconds(3);
49 // Ensure that we don't wait indefinitely for the plugin to shutdown. 49 // Ensure that we don't wait indefinitely for the plugin to shutdown.
50 // as the browser does not terminate plugin processes on shutdown. 50 // as the browser does not terminate plugin processes on shutdown.
51 // We achieve this by posting an exit process task on the IO thread. 51 // We achieve this by posting an exit process task on the IO thread.
52 base::MessageLoop::current()->PostDelayedTask( 52 base::MessageLoop::current()->PostDelayedTask(
53 FROM_HERE, 53 FROM_HERE,
54 base::Bind(&EnsureTerminateMessageFilter::Terminate, this), 54 base::Bind(&EnsureTerminateMessageFilter::Terminate, this),
55 kPluginProcessTerminateTimeout); 55 kPluginProcessTerminateTimeout);
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 152 }
153 153
154 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); 154 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle));
155 } 155 }
156 156
157 void PluginThread::OnNotifyRenderersOfPendingShutdown() { 157 void PluginThread::OnNotifyRenderersOfPendingShutdown() {
158 PluginChannel::NotifyRenderersOfPendingShutdown(); 158 PluginChannel::NotifyRenderersOfPendingShutdown();
159 } 159 }
160 160
161 } // namespace content 161 } // namespace content
OLDNEW
« no previous file with comments | « content/plugin/plugin_thread.h ('k') | content/plugin/webplugin_accelerated_surface_proxy_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698