| commit | a1f7f6e9b24fd6636cf81a8d05497dc8cf8f5cea | [log] [tgz] |
|---|---|---|
| author | thakis <[email protected]> | Sat Jul 18 00:44:28 2015 |
| committer | Commit bot <[email protected]> | Sat Jul 18 00:44:59 2015 |
| tree | 4b6e77daaac0d253cdd20aa719c1c23392b9e9f1 | |
| parent | b18109743183eca85b2c30eb920f537e5e166658 [diff] [blame] |
Remove some unneeded virtual inheritance. All these classes have at most one subclass, so there's no point in them being virtually derived. magnification_controller.cc: Added in https://chromiumcodereview.appspot.com/10388141 , the virtual never had any effect. The two download_files: Added in https://codereview.chromium.org/8372034, never had any effect. plugin_power_saver_browsertest: Added in https://codereview.chromium.org/1088763002 , likely copied from prerender_browsertest, never had any effect. (prerender_browsertest grew it in https://chromiumcodereview.appspot.com/10701140 and it's sadly needed there.) No intended behavior change. BUG=none TBR=sky Review URL: https://codereview.chromium.org/1234883006 Cr-Commit-Position: refs/heads/master@{#339368}
diff --git a/content/browser/download/mock_download_file.h b/content/browser/download/mock_download_file.h index 5d4b270..8be2c93 100644 --- a/content/browser/download/mock_download_file.h +++ b/content/browser/download/mock_download_file.h
@@ -18,7 +18,7 @@ namespace content { struct DownloadCreateInfo; -class MockDownloadFile : virtual public DownloadFile { +class MockDownloadFile : public DownloadFile { public: MockDownloadFile(); virtual ~MockDownloadFile();