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

Side by Side Diff: content/browser/in_process_webkit/webkit_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
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_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ 5 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_
6 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ 6 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 13 matching lines...) Expand all
24 void Initialize(); 24 void Initialize();
25 25
26 private: 26 private:
27 // Must be private so that we can carefully control its lifetime. 27 // Must be private so that we can carefully control its lifetime.
28 class InternalWebKitThread : public content::BrowserThreadImpl { 28 class InternalWebKitThread : public content::BrowserThreadImpl {
29 public: 29 public:
30 InternalWebKitThread(); 30 InternalWebKitThread();
31 virtual ~InternalWebKitThread(); 31 virtual ~InternalWebKitThread();
32 // Does the actual initialization and shutdown of WebKit. Called at the 32 // Does the actual initialization and shutdown of WebKit. Called at the
33 // beginning and end of the thread's lifetime. 33 // beginning and end of the thread's lifetime.
34 virtual void Init(); 34 virtual void Init() OVERRIDE;
35 virtual void CleanUp(); 35 virtual void CleanUp() OVERRIDE;
36 36
37 private: 37 private:
38 // The WebKitPlatformSupport implementation. Only access on WebKit thread. 38 // The WebKitPlatformSupport implementation. Only access on WebKit thread.
39 scoped_ptr<BrowserWebKitPlatformSupportImpl> webkit_platform_support_; 39 scoped_ptr<BrowserWebKitPlatformSupportImpl> webkit_platform_support_;
40 }; 40 };
41 41
42 // Pointer to the actual WebKitThread. 42 // Pointer to the actual WebKitThread.
43 scoped_ptr<InternalWebKitThread> webkit_thread_; 43 scoped_ptr<InternalWebKitThread> webkit_thread_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(WebKitThread); 45 DISALLOW_COPY_AND_ASSIGN(WebKitThread);
46 }; 46 };
47 47
48 #endif // CONTENT_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_ 48 #endif // CONTENT_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_THREAD_H_
OLDNEW
« no previous file with comments | « content/browser/in_process_webkit/indexed_db_dispatcher_host.h ('k') | content/browser/mach_broker_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698