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

Unified Diff: ui/compositor/compositor.cc

Issue 12813004: Chromium style checker cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/resizing_host_observer_unittest.cc ('k') | ui/message_center/views/message_center_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index bff9e8b6b85ba9bce20b8fc19687cf1df89ea491..47b725839f07647be10be9ccd8f32b5b6d175ea6 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -128,13 +128,15 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
return !!context3d_;
}
- virtual bool BindToCurrentThread() {
+ virtual bool BindToCurrentThread() OVERRIDE {
return context3d_->makeContextCurrent();
}
- virtual WebKit::WebGraphicsContext3D* Context3d() { return context3d_.get(); }
+ virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE {
+ return context3d_.get();
+ }
- virtual class GrContext* GrContext() {
+ virtual class GrContext* GrContext() OVERRIDE {
if (!gr_context_) {
gr_context_.reset(
new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get()));
@@ -149,7 +151,7 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
destroyed_ = true;
}
- bool DestroyedOnMainThread() {
+ virtual bool DestroyedOnMainThread() OVERRIDE {
base::AutoLock lock(destroyed_lock_);
return destroyed_;
}
« no previous file with comments | « remoting/host/resizing_host_observer_unittest.cc ('k') | ui/message_center/views/message_center_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698