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

Side by Side Diff: chrome/browser/first_run/first_run_browsertest.cc

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 DISALLOW_COPY_AND_ASSIGN(FirstRunMasterPrefsBrowserTestBase); 122 DISALLOW_COPY_AND_ASSIGN(FirstRunMasterPrefsBrowserTestBase);
123 }; 123 };
124 124
125 template<const char Text[]> 125 template<const char Text[]>
126 class FirstRunMasterPrefsBrowserTestT 126 class FirstRunMasterPrefsBrowserTestT
127 : public FirstRunMasterPrefsBrowserTestBase { 127 : public FirstRunMasterPrefsBrowserTestBase {
128 public: 128 public:
129 FirstRunMasterPrefsBrowserTestT() {} 129 FirstRunMasterPrefsBrowserTestT() {}
130 130
131 protected: 131 protected:
132 virtual void SetUp() override { 132 void SetUp() override {
133 SetMasterPreferencesForTest(Text); 133 SetMasterPreferencesForTest(Text);
134 FirstRunMasterPrefsBrowserTestBase::SetUp(); 134 FirstRunMasterPrefsBrowserTestBase::SetUp();
135 } 135 }
136 136
137 private: 137 private:
138 DISALLOW_COPY_AND_ASSIGN(FirstRunMasterPrefsBrowserTestT); 138 DISALLOW_COPY_AND_ASSIGN(FirstRunMasterPrefsBrowserTestT);
139 }; 139 };
140 140
141 // Returns the true expected import state, derived from the original 141 // Returns the true expected import state, derived from the original
142 // |expected_import_state|, for the current test machine's configuration. Some 142 // |expected_import_state|, for the current test machine's configuration. Some
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 FirstRunMasterPrefsWithTrackedPreferences, 303 FirstRunMasterPrefsWithTrackedPreferences,
304 testing::Values( 304 testing::Values(
305 chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement, 305 chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement,
306 chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways, 306 chrome_prefs::internals::kSettingsEnforcementGroupEnforceAlways,
307 chrome_prefs::internals:: 307 chrome_prefs::internals::
308 kSettingsEnforcementGroupEnforceAlwaysWithDSE, 308 kSettingsEnforcementGroupEnforceAlwaysWithDSE,
309 chrome_prefs::internals:: 309 chrome_prefs::internals::
310 kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE)); 310 kSettingsEnforcementGroupEnforceAlwaysWithExtensionsAndDSE));
311 311
312 #endif // !defined(OS_CHROMEOS) 312 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/extensions/global_shortcut_listener_win.h ('k') | chrome/browser/first_run/try_chrome_dialog_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698