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

Side by Side Diff: chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #if defined(OS_MACOSX) 7 #if defined(OS_MACOSX)
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #endif 9 #endif
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 suffix += "_novsync"; 91 suffix += "_novsync";
92 if (HasFlag(kTestThroughWebRTC)) 92 if (HasFlag(kTestThroughWebRTC))
93 suffix += "_webrtc"; 93 suffix += "_webrtc";
94 if (!ScalingMethod().empty()) 94 if (!ScalingMethod().empty())
95 suffix += "_scale" + ScalingMethod(); 95 suffix += "_scale" + ScalingMethod();
96 if (HasFlag(kSmallWindow)) 96 if (HasFlag(kSmallWindow))
97 suffix += "_small"; 97 suffix += "_small";
98 return suffix; 98 return suffix;
99 } 99 }
100 100
101 virtual void SetUp() OVERRIDE { 101 virtual void SetUp() override {
102 EnablePixelOutput(); 102 EnablePixelOutput();
103 ExtensionApiTest::SetUp(); 103 ExtensionApiTest::SetUp();
104 } 104 }
105 105
106 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 106 virtual void SetUpCommandLine(CommandLine* command_line) override {
107 if (!ScalingMethod().empty()) { 107 if (!ScalingMethod().empty()) {
108 command_line->AppendSwitchASCII(switches::kTabCaptureUpscaleQuality, 108 command_line->AppendSwitchASCII(switches::kTabCaptureUpscaleQuality,
109 ScalingMethod()); 109 ScalingMethod());
110 command_line->AppendSwitchASCII(switches::kTabCaptureDownscaleQuality, 110 command_line->AppendSwitchASCII(switches::kTabCaptureDownscaleQuality,
111 ScalingMethod()); 111 ScalingMethod());
112 } 112 }
113 113
114 // Some of the tests may launch http requests through JSON or AJAX 114 // Some of the tests may launch http requests through JSON or AJAX
115 // which causes a security error (cross domain request) when the page 115 // which causes a security error (cross domain request) when the page
116 // is loaded from the local file system ( file:// ). The following switch 116 // is loaded from the local file system ( file:// ). The following switch
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 TabCapturePerformanceTest, 250 TabCapturePerformanceTest,
251 testing::Values( 251 testing::Values(
252 kScalingTestBase | kScaleQualityFast, 252 kScalingTestBase | kScaleQualityFast,
253 kScalingTestBase | kScaleQualityGood, 253 kScalingTestBase | kScaleQualityGood,
254 kScalingTestBase | kScaleQualityBest, 254 kScalingTestBase | kScaleQualityBest,
255 kScalingTestBase | kScaleQualityFast | kSmallWindow, 255 kScalingTestBase | kScaleQualityFast | kSmallWindow,
256 kScalingTestBase | kScaleQualityGood | kSmallWindow, 256 kScalingTestBase | kScaleQualityGood | kSmallWindow,
257 kScalingTestBase | kScaleQualityBest | kSmallWindow)); 257 kScalingTestBase | kScaleQualityBest | kSmallWindow));
258 258
259 #endif // USE_AURA 259 #endif // USE_AURA
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698