diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 09:12:48 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 09:12:48 +0000 |
commit | aa3174b125392c20bbac2db1b324a050340d9578 (patch) | |
tree | c7c6f52c6bc964e06d10b5e307d6ac1fcc21e0fe /ui | |
parent | 72c42175d24e77f89781f2a6b3eb0ab04e13e296 (diff) | |
download | chromium_src-aa3174b125392c20bbac2db1b324a050340d9578.zip chromium_src-aa3174b125392c20bbac2db1b324a050340d9578.tar.gz chromium_src-aa3174b125392c20bbac2db1b324a050340d9578.tar.bz2 |
Chromium style checker cleanup
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
TBR=ben, brettw, jamesr, joi, satorux, piman, wez
Review URL: https://chromiumcodereview.appspot.com/12813004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/compositor/compositor.cc | 10 | ||||
-rw-r--r-- | ui/message_center/views/message_center_bubble.cc | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index bff9e8b..47b72583 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_; } diff --git a/ui/message_center/views/message_center_bubble.cc b/ui/message_center/views/message_center_bubble.cc index 4db8aee..e925a14 100644 --- a/ui/message_center/views/message_center_bubble.cc +++ b/ui/message_center/views/message_center_bubble.cc @@ -210,7 +210,7 @@ class WebNotificationButtonView2 : public WebNotificationButtonViewBase, private: // Overridden from views::View: - virtual void ChildVisibilityChanged(views::View* child) { + virtual void ChildVisibilityChanged(views::View* child) OVERRIDE { InvalidateLayout(); } |