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

Unified Diff: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

Issue 686463004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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
Index: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
index e8ae27d35ecf235bbb8e7d7f6a908dbf5fbbb268..7c4b0e9b205fa4e159a69c1f5a8b923aee9e9488 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc
@@ -24,32 +24,29 @@ class DesktopThemeProvider : public ui::ThemeProvider {
: delegate_(delegate) {
}
- virtual bool UsingSystemTheme() const override {
+ bool UsingSystemTheme() const override {
return delegate_->UsingSystemTheme();
}
- virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
+ gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
if (delegate_->UsingSystemTheme())
return delegate_->GetImageSkiaNamed(id);
return delegate_->GetImageSkiaNamed(
chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
}
- virtual SkColor GetColor(int id) const override {
- return delegate_->GetColor(id);
- }
- virtual int GetDisplayProperty(int id) const override {
+ SkColor GetColor(int id) const override { return delegate_->GetColor(id); }
+ int GetDisplayProperty(int id) const override {
return delegate_->GetDisplayProperty(id);
}
- virtual bool ShouldUseNativeFrame() const override {
+ bool ShouldUseNativeFrame() const override {
return delegate_->ShouldUseNativeFrame();
}
- virtual bool HasCustomImage(int id) const override {
+ bool HasCustomImage(int id) const override {
return delegate_->HasCustomImage(
chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
}
- virtual base::RefCountedMemory* GetRawData(
- int id,
- ui::ScaleFactor scale_factor) const override {
+ base::RefCountedMemory* GetRawData(int id, ui::ScaleFactor scale_factor)
+ const override {
return delegate_->GetRawData(id, scale_factor);
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h ('k') | chrome/browser/ui/views/frame/browser_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698