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

Side by Side Diff: chrome/browser/sessions/session_restore_browsertest_chromeos.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 (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 <list> 5 #include <list>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 12 matching lines...) Expand all
23 namespace { 23 namespace {
24 const char* test_app_popup_name1 = "TestApp1"; 24 const char* test_app_popup_name1 = "TestApp1";
25 const char* test_app_popup_name2 = "TestApp2"; 25 const char* test_app_popup_name2 = "TestApp2";
26 } 26 }
27 27
28 class SessionRestoreTestChromeOS : public InProcessBrowserTest { 28 class SessionRestoreTestChromeOS : public InProcessBrowserTest {
29 public: 29 public:
30 virtual ~SessionRestoreTestChromeOS() {} 30 virtual ~SessionRestoreTestChromeOS() {}
31 31
32 protected: 32 protected:
33 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { 33 virtual void SetUpCommandLine(base::CommandLine* command_line) override {
34 InProcessBrowserTest::SetUpCommandLine(command_line); 34 InProcessBrowserTest::SetUpCommandLine(command_line);
35 } 35 }
36 36
37 Browser* CreateBrowserWithParams(Browser::CreateParams params) { 37 Browser* CreateBrowserWithParams(Browser::CreateParams params) {
38 Browser* browser = new Browser(params); 38 Browser* browser = new Browser(params);
39 AddBlankTabAndShow(browser); 39 AddBlankTabAndShow(browser);
40 browser_list_.push_back(browser); 40 browser_list_.push_back(browser);
41 return browser; 41 return browser;
42 } 42 }
43 43
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 size_t total_count = 0; 161 size_t total_count = 0;
162 size_t maximized_count = 0; 162 size_t maximized_count = 0;
163 for (chrome::BrowserIterator it; !it.done(); it.Next()) { 163 for (chrome::BrowserIterator it; !it.done(); it.Next()) {
164 ++total_count; 164 ++total_count;
165 if (it->window()->IsMaximized()) 165 if (it->window()->IsMaximized())
166 ++maximized_count; 166 ++maximized_count;
167 } 167 }
168 EXPECT_EQ(4u, total_count); 168 EXPECT_EQ(4u, total_count);
169 EXPECT_EQ(2u, maximized_count); 169 EXPECT_EQ(2u, maximized_count);
170 } 170 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/session_restore_browsertest.cc ('k') | chrome/browser/sessions/session_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698