chrome/browser/ui/browser_browsertest.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/ui/bookmarks/bookmark_context_menu_controller.cc ('k') | chrome/browser/ui/browser_instant_controller.h » ('j') | no next file with comments »

OLD	NEW
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 <string>	5 #include <string>

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/file_path.h"	9 #include "base/file_path.h"

10 #include "base/sys_info.h"	10 #include "base/sys_info.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "chrome/app/chrome_command_ids.h"	12 #include "chrome/app/chrome_command_ids.h"

13 #include "chrome/browser/command_updater.h"	13 #include "chrome/browser/command_updater.h"

14 #include "chrome/browser/content_settings/host_content_settings_map.h"	14 #include "chrome/browser/content_settings/host_content_settings_map.h"

15 #include "chrome/browser/defaults.h"	15 #include "chrome/browser/defaults.h"

16 #include "chrome/browser/extensions/extension_browsertest.h"	16 #include "chrome/browser/extensions/extension_browsertest.h"

17 #include "chrome/browser/extensions/extension_service.h"	17 #include "chrome/browser/extensions/extension_service.h"

18 #include "chrome/browser/extensions/extension_system.h"	18 #include "chrome/browser/extensions/extension_system.h"

19 #include "chrome/browser/extensions/tab_helper.h"	19 #include "chrome/browser/extensions/tab_helper.h"

20 #include "chrome/browser/first_run/first_run.h"	20 #include "chrome/browser/first_run/first_run.h"

21 #include "chrome/browser/prefs/incognito_mode_prefs.h"	21 #include "chrome/browser/prefs/incognito_mode_prefs.h"

	22 #include "chrome/browser/prefs/pref_service.h"

22 #include "chrome/browser/profiles/profile.h"	23 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/profiles/profile_manager.h"	24 #include "chrome/browser/profiles/profile_manager.h"

24 #include "chrome/browser/sessions/session_backend.h"	25 #include "chrome/browser/sessions/session_backend.h"

25 #include "chrome/browser/sessions/session_service_factory.h"	26 #include "chrome/browser/sessions/session_service_factory.h"

26 #include "chrome/browser/translate/translate_tab_helper.h"	27 #include "chrome/browser/translate/translate_tab_helper.h"

27 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"	28 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"

28 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"	29 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"

29 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"	30 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"

30 #include "chrome/browser/ui/browser.h"	31 #include "chrome/browser/ui/browser.h"

31 #include "chrome/browser/ui/browser_command_controller.h"	32 #include "chrome/browser/ui/browser_command_controller.h"

(...skipping 1938 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1970 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);	1971 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);

1971 }	1972 }

1972	1973

1973 // Shift-middle-clicks open in a foreground tab.	1974 // Shift-middle-clicks open in a foreground tab.

1974 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {	1975 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {

1975 int modifiers = WebKit::WebInputEvent::ShiftKey;	1976 int modifiers = WebKit::WebInputEvent::ShiftKey;

1976 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;	1977 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;

1977 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;	1978 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;

1978 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);	1979 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);

1979 }	1980 }

OLD	NEW