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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 6086003: Cleanup: Remove unneeded includes of chrome_switches.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chrome_plugin_host.cc ('k') | chrome/browser/collected_cookies_uitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 5 #include "app/l10n_util.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/login/account_screen.h" 7 #include "chrome/browser/chromeos/login/account_screen.h"
8 #include "chrome/browser/chromeos/login/eula_view.h" 8 #include "chrome/browser/chromeos/login/eula_view.h"
9 #include "chrome/browser/chromeos/login/language_switch_menu.h" 9 #include "chrome/browser/chromeos/login/language_switch_menu.h"
10 #include "chrome/browser/chromeos/login/login_screen.h" 10 #include "chrome/browser/chromeos/login/login_screen.h"
11 #include "chrome/browser/chromeos/login/mock_update_screen.h" 11 #include "chrome/browser/chromeos/login/mock_update_screen.h"
12 #include "chrome/browser/chromeos/login/network_screen.h" 12 #include "chrome/browser/chromeos/login/network_screen.h"
13 #include "chrome/browser/chromeos/login/network_selection_view.h" 13 #include "chrome/browser/chromeos/login/network_selection_view.h"
14 #include "chrome/browser/chromeos/login/user_image_screen.h" 14 #include "chrome/browser/chromeos/login/user_image_screen.h"
15 #include "chrome/browser/chromeos/login/wizard_controller.h" 15 #include "chrome/browser/chromeos/login/wizard_controller.h"
16 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" 16 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/test/ui_test_utils.h" 17 #include "chrome/test/ui_test_utils.h"
19 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
20 #include "testing/gmock/include/gmock/gmock.h" 19 #include "testing/gmock/include/gmock/gmock.h"
21 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
22 #include "unicode/locid.h" 21 #include "unicode/locid.h"
23 #include "views/accelerator.h" 22 #include "views/accelerator.h"
24 23
25 namespace { 24 namespace {
26 25
27 template <class T> 26 template <class T>
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen()); 262 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen());
264 263
265 focus_manager = controller()->contents()->GetFocusManager(); 264 focus_manager = controller()->contents()->GetFocusManager();
266 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); 265 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
267 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen)); 266 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen));
268 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen()); 267 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
269 } 268 }
270 269
271 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 18, 270 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 18,
272 add_tests_for_new_control_flow_you_just_introduced); 271 add_tests_for_new_control_flow_you_just_introduced);
OLDNEW
« no previous file with comments | « chrome/browser/chrome_plugin_host.cc ('k') | chrome/browser/collected_cookies_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698