chrome/browser/extensions/platform_app_browsertest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/extensions/platform_app_browsertest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/extensions/menu_manager_unittest.cc ('k') | chrome/browser/extensions/plugin_apitest.cc » ('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 "base/bind.h"	5 #include "base/bind.h"

	6 #include "base/prefs/pref_service.h"

6 #include "base/test/test_timeouts.h"	7 #include "base/test/test_timeouts.h"

7 #include "base/threading/platform_thread.h"	8 #include "base/threading/platform_thread.h"

8 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

9 #include "chrome/app/chrome_command_ids.h"	10 #include "chrome/app/chrome_command_ids.h"

10 #include "chrome/browser/automation/automation_util.h"	11 #include "chrome/browser/automation/automation_util.h"

11 #include "chrome/browser/devtools/devtools_window.h"	12 #include "chrome/browser/devtools/devtools_window.h"

12 #include "chrome/browser/extensions/api/permissions/permissions_api.h"	13 #include "chrome/browser/extensions/api/permissions/permissions_api.h"

13 #include "chrome/browser/extensions/extension_browsertest.h"	14 #include "chrome/browser/extensions/extension_browsertest.h"

14 #include "chrome/browser/extensions/extension_prefs.h"	15 #include "chrome/browser/extensions/extension_prefs.h"

15 #include "chrome/browser/extensions/extension_service.h"	16 #include "chrome/browser/extensions/extension_service.h"

16 #include "chrome/browser/extensions/extension_system.h"	17 #include "chrome/browser/extensions/extension_system.h"

17 #include "chrome/browser/extensions/extension_test_message_listener.h"	18 #include "chrome/browser/extensions/extension_test_message_listener.h"

18 #include "chrome/browser/extensions/platform_app_browsertest_util.h"	19 #include "chrome/browser/extensions/platform_app_browsertest_util.h"

19 #include "chrome/browser/extensions/platform_app_launcher.h"	20 #include "chrome/browser/extensions/platform_app_launcher.h"

20 #include "chrome/browser/extensions/shell_window_registry.h"	21 #include "chrome/browser/extensions/shell_window_registry.h"

21 #include "chrome/browser/prefs/pref_registry_syncable.h"	22 #include "chrome/browser/prefs/pref_registry_syncable.h"

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

23 #include "chrome/browser/tab_contents/render_view_context_menu.h"	23 #include "chrome/browser/tab_contents/render_view_context_menu.h"

24 #include "chrome/browser/ui/browser.h"	24 #include "chrome/browser/ui/browser.h"

25 #include "chrome/browser/ui/extensions/application_launch.h"	25 #include "chrome/browser/ui/extensions/application_launch.h"

26 #include "chrome/browser/ui/extensions/native_app_window.h"	26 #include "chrome/browser/ui/extensions/native_app_window.h"

27 #include "chrome/browser/ui/extensions/shell_window.h"	27 #include "chrome/browser/ui/extensions/shell_window.h"

28 #include "chrome/browser/ui/tabs/tab_strip_model.h"	28 #include "chrome/browser/ui/tabs/tab_strip_model.h"

29 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"	29 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"

30 #include "chrome/common/chrome_notification_types.h"	30 #include "chrome/common/chrome_notification_types.h"

31 #include "chrome/common/url_constants.h"	31 #include "chrome/common/url_constants.h"

32 #include "chrome/test/base/ui_test_utils.h"	32 #include "chrome/test/base/ui_test_utils.h"

(...skipping 895 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
928 #define MAYBE_WebContentsHasFocus WebContentsHasFocus	928 #define MAYBE_WebContentsHasFocus WebContentsHasFocus

929 #endif	929 #endif

930 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_WebContentsHasFocus) {	930 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_WebContentsHasFocus) {

931 const Extension* extension = LoadAndLaunchPlatformApp("minimal");	931 const Extension* extension = LoadAndLaunchPlatformApp("minimal");

932 ShellWindow* window = CreateShellWindow(extension);	932 ShellWindow* window = CreateShellWindow(extension);

933 EXPECT_TRUE(window->web_contents()->GetRenderWidgetHostView()->HasFocus());	933 EXPECT_TRUE(window->web_contents()->GetRenderWidgetHostView()->HasFocus());

934 CloseShellWindow(window);	934 CloseShellWindow(window);

935 }	935 }

936	936

937 } // namespace extensions	937 } // namespace extensions

OLD	NEW