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

Side by Side Diff: content/gpu/gpu_child_thread.h

Issue 8587009: Add OVERRIDE to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « content/common/webmessageportchannel_impl.h ('k') | content/gpu/gpu_watchdog_thread.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ 5 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_
6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 27 matching lines...) Expand all
38 38
39 // For single-process mode. 39 // For single-process mode.
40 explicit GpuChildThread(const std::string& channel_id); 40 explicit GpuChildThread(const std::string& channel_id);
41 41
42 virtual ~GpuChildThread(); 42 virtual ~GpuChildThread();
43 43
44 void Init(const base::Time& process_start_time); 44 void Init(const base::Time& process_start_time);
45 void StopWatchdog(); 45 void StopWatchdog();
46 46
47 // ChildThread overrides. 47 // ChildThread overrides.
48 virtual bool Send(IPC::Message* msg); 48 virtual bool Send(IPC::Message* msg) OVERRIDE;
49 virtual bool OnControlMessageReceived(const IPC::Message& msg); 49 virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
50 50
51 private: 51 private:
52 // Message handlers. 52 // Message handlers.
53 void OnInitialize(); 53 void OnInitialize();
54 void OnCollectGraphicsInfo(); 54 void OnCollectGraphicsInfo();
55 void OnClean(); 55 void OnClean();
56 void OnCrash(); 56 void OnCrash();
57 void OnHang(); 57 void OnHang();
58 58
59 #if defined(OS_WIN) 59 #if defined(OS_WIN)
(...skipping 18 matching lines...) Expand all
78 78
79 scoped_ptr<GpuChannelManager> gpu_channel_manager_; 79 scoped_ptr<GpuChannelManager> gpu_channel_manager_;
80 80
81 // Information about the GPU, such as device and vendor ID. 81 // Information about the GPU, such as device and vendor ID.
82 content::GPUInfo gpu_info_; 82 content::GPUInfo gpu_info_;
83 83
84 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); 84 DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
85 }; 85 };
86 86
87 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ 87 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_
OLDNEW
« no previous file with comments | « content/common/webmessageportchannel_impl.h ('k') | content/gpu/gpu_watchdog_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698