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

Side by Side Diff: chrome/browser/ui/browser_navigator_browsertest_chromeos.cc

Issue 857433003: Update {virtual,override,final} to follow C++11 style chrome/browser/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase Created 5 years, 11 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/ui/browser_navigator_browsertest.h" 5 #include "chrome/browser/ui/browser_navigator_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chromeos/login/chrome_restart_request.h" 8 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
9 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 9 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
10 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h" 10 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_finder.h" 12 #include "chrome/browser/ui/browser_finder.h"
13 #include "chrome/browser/ui/browser_navigator.h" 13 #include "chrome/browser/ui/browser_navigator.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chromeos/chromeos_switches.h" 16 #include "chromeos/chromeos_switches.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18 18
19 namespace { 19 namespace {
20 20
21 GURL GetGoogleURL() { 21 GURL GetGoogleURL() {
22 return GURL("http://www.google.com/"); 22 return GURL("http://www.google.com/");
23 } 23 }
24 24
25 // Subclass that tests navigation while in the Guest session. 25 // Subclass that tests navigation while in the Guest session.
26 class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest { 26 class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest {
27 protected: 27 protected:
28 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 28 void SetUpCommandLine(base::CommandLine* command_line) override {
29 base::CommandLine command_line_copy = *command_line; 29 base::CommandLine command_line_copy = *command_line;
30 command_line_copy.AppendSwitchASCII( 30 command_line_copy.AppendSwitchASCII(
31 chromeos::switches::kLoginProfile, "user"); 31 chromeos::switches::kLoginProfile, "user");
32 command_line_copy.AppendSwitch(chromeos::switches::kGuestSession); 32 command_line_copy.AppendSwitch(chromeos::switches::kGuestSession);
33 chromeos::GetOffTheRecordCommandLine(GetGoogleURL(), 33 chromeos::GetOffTheRecordCommandLine(GetGoogleURL(),
34 true, 34 true,
35 command_line_copy, 35 command_line_copy,
36 command_line); 36 command_line);
37 } 37 }
38 }; 38 };
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 EXPECT_EQ(3u, chrome::GetTotalBrowserCount()); 113 EXPECT_EQ(3u, chrome::GetTotalBrowserCount());
114 114
115 // The ShowWindowForUser should not have been called since the window is 115 // The ShowWindowForUser should not have been called since the window is
116 // already on the correct desktop. 116 // already on the correct desktop.
117 ASSERT_FALSE(manager->created_window()); 117 ASSERT_FALSE(manager->created_window());
118 } 118 }
119 } 119 }
120 120
121 } // namespace 121 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698