| Index: content/renderer/render_thread_impl.h
|
| diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
|
| index b1ed5ce643bb2a9626d2b8fd075687118fbdae27..cb27dff813be817fc5007540c5fa757e2ba00f65 100644
|
| --- a/content/renderer/render_thread_impl.h
|
| +++ b/content/renderer/render_thread_impl.h
|
| @@ -121,7 +121,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
|
| // Constructor that's used when running in single process mode.
|
| explicit RenderThreadImpl(const std::string& channel_name);
|
| virtual ~RenderThreadImpl();
|
| - virtual void Shutdown() OVERRIDE;
|
| + virtual void Shutdown() override;
|
|
|
| // When initializing WebKit, ensure that any schemes needed for the content
|
| // module are registered properly. Static to allow sharing with tests.
|
| @@ -132,42 +132,42 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
|
| static void NotifyTimezoneChange();
|
|
|
| // RenderThread implementation:
|
| - virtual bool Send(IPC::Message* msg) OVERRIDE;
|
| - virtual base::MessageLoop* GetMessageLoop() OVERRIDE;
|
| - virtual IPC::SyncChannel* GetChannel() OVERRIDE;
|
| - virtual std::string GetLocale() OVERRIDE;
|
| - virtual IPC::SyncMessageFilter* GetSyncMessageFilter() OVERRIDE;
|
| + virtual bool Send(IPC::Message* msg) override;
|
| + virtual base::MessageLoop* GetMessageLoop() override;
|
| + virtual IPC::SyncChannel* GetChannel() override;
|
| + virtual std::string GetLocale() override;
|
| + virtual IPC::SyncMessageFilter* GetSyncMessageFilter() override;
|
| virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy()
|
| - OVERRIDE;
|
| - virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE;
|
| - virtual void RemoveRoute(int32 routing_id) OVERRIDE;
|
| - virtual int GenerateRoutingID() OVERRIDE;
|
| - virtual void AddFilter(IPC::MessageFilter* filter) OVERRIDE;
|
| - virtual void RemoveFilter(IPC::MessageFilter* filter) OVERRIDE;
|
| - virtual void AddObserver(RenderProcessObserver* observer) OVERRIDE;
|
| - virtual void RemoveObserver(RenderProcessObserver* observer) OVERRIDE;
|
| + override;
|
| + virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override;
|
| + virtual void RemoveRoute(int32 routing_id) override;
|
| + virtual int GenerateRoutingID() override;
|
| + virtual void AddFilter(IPC::MessageFilter* filter) override;
|
| + virtual void RemoveFilter(IPC::MessageFilter* filter) override;
|
| + virtual void AddObserver(RenderProcessObserver* observer) override;
|
| + virtual void RemoveObserver(RenderProcessObserver* observer) override;
|
| virtual void SetResourceDispatcherDelegate(
|
| - ResourceDispatcherDelegate* delegate) OVERRIDE;
|
| - virtual void EnsureWebKitInitialized() OVERRIDE;
|
| - virtual void RecordAction(const base::UserMetricsAction& action) OVERRIDE;
|
| - virtual void RecordComputedAction(const std::string& action) OVERRIDE;
|
| + ResourceDispatcherDelegate* delegate) override;
|
| + virtual void EnsureWebKitInitialized() override;
|
| + virtual void RecordAction(const base::UserMetricsAction& action) override;
|
| + virtual void RecordComputedAction(const std::string& action) override;
|
| virtual scoped_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer(
|
| - size_t buffer_size) OVERRIDE;
|
| - virtual void RegisterExtension(v8::Extension* extension) OVERRIDE;
|
| - virtual void ScheduleIdleHandler(int64 initial_delay_ms) OVERRIDE;
|
| - virtual void IdleHandler() OVERRIDE;
|
| - virtual int64 GetIdleNotificationDelayInMs() const OVERRIDE;
|
| + size_t buffer_size) override;
|
| + virtual void RegisterExtension(v8::Extension* extension) override;
|
| + virtual void ScheduleIdleHandler(int64 initial_delay_ms) override;
|
| + virtual void IdleHandler() override;
|
| + virtual int64 GetIdleNotificationDelayInMs() const override;
|
| virtual void SetIdleNotificationDelayInMs(
|
| - int64 idle_notification_delay_in_ms) OVERRIDE;
|
| - virtual void UpdateHistograms(int sequence_number) OVERRIDE;
|
| - virtual int PostTaskToAllWebWorkers(const base::Closure& closure) OVERRIDE;
|
| - virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) OVERRIDE;
|
| - virtual base::WaitableEvent* GetShutdownEvent() OVERRIDE;
|
| + int64 idle_notification_delay_in_ms) override;
|
| + virtual void UpdateHistograms(int sequence_number) override;
|
| + virtual int PostTaskToAllWebWorkers(const base::Closure& closure) override;
|
| + virtual bool ResolveProxy(const GURL& url, std::string* proxy_list) override;
|
| + virtual base::WaitableEvent* GetShutdownEvent() override;
|
| #if defined(OS_WIN)
|
| - virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE;
|
| - virtual void ReleaseCachedFonts() OVERRIDE;
|
| + virtual void PreCacheFont(const LOGFONT& log_font) override;
|
| + virtual void ReleaseCachedFonts() override;
|
| #endif
|
| - virtual ServiceRegistry* GetServiceRegistry() OVERRIDE;
|
| + virtual ServiceRegistry* GetServiceRegistry() override;
|
|
|
| // Synchronously establish a channel to the GPU plugin if not previously
|
| // established or if it has been lost (for example if the GPU plugin crashed).
|
| @@ -401,23 +401,23 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
|
|
|
| private:
|
| // ChildThread
|
| - virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
|
| + virtual bool OnControlMessageReceived(const IPC::Message& msg) override;
|
|
|
| // GpuChannelHostFactory implementation:
|
| - virtual bool IsMainThread() OVERRIDE;
|
| - virtual base::MessageLoop* GetMainLoop() OVERRIDE;
|
| - virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() OVERRIDE;
|
| + virtual bool IsMainThread() override;
|
| + virtual base::MessageLoop* GetMainLoop() override;
|
| + virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() override;
|
| virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory(
|
| - size_t size) OVERRIDE;
|
| + size_t size) override;
|
| virtual CreateCommandBufferResult CreateViewCommandBuffer(
|
| int32 surface_id,
|
| const GPUCreateCommandBufferConfig& init_params,
|
| - int32 route_id) OVERRIDE;
|
| + int32 route_id) override;
|
| virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
|
| size_t width,
|
| size_t height,
|
| unsigned internalformat,
|
| - unsigned usage) OVERRIDE;
|
| + unsigned usage) override;
|
|
|
| void Init();
|
|
|
|
|