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

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

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" 7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h"
8 #include "chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_sc reen.h" 8 #include "chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_sc reen.h"
9 #include "chrome/browser/chromeos/login/existing_user_controller.h" 9 #include "chrome/browser/chromeos/login/existing_user_controller.h"
10 #include "chrome/browser/chromeos/login/language_switch_menu.h" 10 #include "chrome/browser/chromeos/login/language_switch_menu.h"
11 #include "chrome/browser/chromeos/login/mock_eula_screen.h" 11 #include "chrome/browser/chromeos/login/mock_eula_screen.h"
12 #include "chrome/browser/chromeos/login/mock_network_screen.h" 12 #include "chrome/browser/chromeos/login/mock_network_screen.h"
13 #include "chrome/browser/chromeos/login/mock_update_screen.h" 13 #include "chrome/browser/chromeos/login/mock_update_screen.h"
14 #include "chrome/browser/chromeos/login/network_screen.h" 14 #include "chrome/browser/chromeos/login/network_screen.h"
15 #include "chrome/browser/chromeos/login/user_image_screen.h" 15 #include "chrome/browser/chromeos/login/user_image_screen.h"
16 #include "chrome/browser/chromeos/login/view_screen.h" 16 #include "chrome/browser/chromeos/login/view_screen.h"
17 #include "chrome/browser/chromeos/login/wizard_controller.h" 17 #include "chrome/browser/chromeos/login/wizard_controller.h"
18 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" 18 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
19 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/models/accelerator.h"
24 #include "unicode/locid.h" 25 #include "unicode/locid.h"
25 #include "views/accelerator.h"
26 26
27 namespace chromeos { 27 namespace chromeos {
28 28
29 template <class T, class H> 29 template <class T, class H>
30 class MockOutShowHide : public T { 30 class MockOutShowHide : public T {
31 public: 31 public:
32 template <class P> explicit MockOutShowHide(P p) : T(p) {} 32 template <class P> explicit MockOutShowHide(P p) : T(p) {}
33 template <class P> MockOutShowHide(P p, H* actor) 33 template <class P> MockOutShowHide(P p, H* actor)
34 : T(p, actor), actor_(actor) {} 34 : T(p, actor), actor_(actor) {}
35 MOCK_METHOD0(Show, void()); 35 MOCK_METHOD0(Show, void());
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 set_controller(NULL); 238 set_controller(NULL);
239 } 239 }
240 #endif 240 #endif
241 241
242 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 242 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
243 243
244 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15, 244 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15,
245 add_tests_for_new_control_flow_you_just_introduced); 245 add_tests_for_new_control_flow_you_just_introduced);
246 246
247 } // namespace chromeos 247 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/external_tab_container_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698