| Index: content/browser/ppapi_plugin_process_host.cc
|
| diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
|
| index 49d301719ff903baf684f8861b46dfcc6f4ed520..8346abff65e1c664aa39b1f4f507228c88387f53 100644
|
| --- a/content/browser/ppapi_plugin_process_host.cc
|
| +++ b/content/browser/ppapi_plugin_process_host.cc
|
| @@ -51,7 +51,7 @@ class PpapiPluginSandboxedProcessLauncherDelegate
|
| virtual ~PpapiPluginSandboxedProcessLauncherDelegate() {}
|
|
|
| #if defined(OS_WIN)
|
| - virtual bool ShouldSandbox() OVERRIDE {
|
| + virtual bool ShouldSandbox() override {
|
| return !is_broker_;
|
| }
|
|
|
| @@ -69,14 +69,14 @@ class PpapiPluginSandboxedProcessLauncherDelegate
|
| }
|
|
|
| #elif defined(OS_POSIX)
|
| - virtual bool ShouldUseZygote() OVERRIDE {
|
| + virtual bool ShouldUseZygote() override {
|
| const base::CommandLine& browser_command_line =
|
| *base::CommandLine::ForCurrentProcess();
|
| base::CommandLine::StringType plugin_launcher = browser_command_line
|
| .GetSwitchValueNative(switches::kPpapiPluginLauncher);
|
| return !is_broker_ && plugin_launcher.empty() && info_.is_sandboxed;
|
| }
|
| - virtual int GetIpcFd() OVERRIDE {
|
| + virtual int GetIpcFd() override {
|
| return ipc_fd_;
|
| }
|
| #endif // OS_WIN
|
| @@ -107,7 +107,7 @@ class PpapiPluginProcessHost::PluginNetworkObserver
|
| }
|
|
|
| // IPAddressObserver implementation.
|
| - virtual void OnIPAddressChanged() OVERRIDE {
|
| + virtual void OnIPAddressChanged() override {
|
| // TODO(brettw) bug 90246: This doesn't seem correct. The online/offline
|
| // notification seems like it should be sufficient, but I don't see that
|
| // when I unplug and replug my network cable. Sending this notification when
|
| @@ -119,7 +119,7 @@ class PpapiPluginProcessHost::PluginNetworkObserver
|
|
|
| // ConnectionTypeObserver implementation.
|
| virtual void OnConnectionTypeChanged(
|
| - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
|
| + net::NetworkChangeNotifier::ConnectionType type) override {
|
| process_host_->Send(new PpapiMsg_SetNetworkState(
|
| type != net::NetworkChangeNotifier::CONNECTION_NONE));
|
| }
|
|
|