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

Side by Side Diff: chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.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 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 <string> 5 #include <string>
6 6
7 #include <shlobj.h> // Must be before propkey. 7 #include <shlobj.h> // Must be before propkey.
8 #include <propkey.h> 8 #include <propkey.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 10
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 } 162 }
163 163
164 } // namespace 164 } // namespace
165 165
166 // Tests that require the profile shortcut manager to be instantiated despite 166 // Tests that require the profile shortcut manager to be instantiated despite
167 // having --user-data-dir specified. 167 // having --user-data-dir specified.
168 class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest { 168 class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest {
169 public: 169 public:
170 BrowserTestWithProfileShortcutManager() {} 170 BrowserTestWithProfileShortcutManager() {}
171 171
172 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 172 void SetUpCommandLine(base::CommandLine* command_line) override {
173 command_line->AppendSwitch(switches::kEnableProfileShortcutManager); 173 command_line->AppendSwitch(switches::kEnableProfileShortcutManager);
174 } 174 }
175 175
176 private: 176 private:
177 DISALLOW_COPY_AND_ASSIGN(BrowserTestWithProfileShortcutManager); 177 DISALLOW_COPY_AND_ASSIGN(BrowserTestWithProfileShortcutManager);
178 }; 178 };
179 179
180 // Check that the window properties on Windows are properly set. 180 // Check that the window properties on Windows are properly set.
181 // http://crbug.com/396344 181 // http://crbug.com/396344
182 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, 182 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) { 263 for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) {
264 if (*it != browser()) 264 if (*it != browser())
265 app_browser = *it; 265 app_browser = *it;
266 } 266 }
267 ASSERT_TRUE(app_browser); 267 ASSERT_TRUE(app_browser);
268 ASSERT_TRUE(app_browser != browser()); 268 ASSERT_TRUE(app_browser != browser());
269 269
270 WaitAndValidateBrowserWindowProperties( 270 WaitAndValidateBrowserWindowProperties(
271 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension)); 271 base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension));
272 } 272 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_ashwin.h ('k') | chrome/browser/ui/views/frame/glass_browser_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698