chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win64 suppress warnings Created 6 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

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 "build/build_config.h"	5 #include "build/build_config.h"

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

7 #include "chrome/browser/fullscreen.h"	6 #include "chrome/browser/fullscreen.h"

8 #include "chrome/browser/profiles/profile.h"	7 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/ui/browser.h"	8 #include "chrome/browser/ui/browser.h"

10 #include "chrome/browser/ui/browser_commands.h"	9 #include "chrome/browser/ui/browser_commands.h"

11 #include "chrome/browser/ui/browser_window.h"	10 #include "chrome/browser/ui/browser_window.h"

12 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h"	11 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h"

13 #include "chrome/browser/ui/tabs/tab_strip_model.h"	12 #include "chrome/browser/ui/tabs/tab_strip_model.h"

14 #include "chrome/test/base/interactive_test_utils.h"	13 #include "chrome/test/base/interactive_test_utils.h"

15 #include "chrome/test/base/ui_test_utils.h"	14 #include "chrome/test/base/ui_test_utils.h"

	15 #include "components/content_settings/core/browser/host_content_settings_map.h"

16 #include "content/public/browser/render_view_host.h"	16 #include "content/public/browser/render_view_host.h"

17 #include "content/public/browser/render_widget_host_view.h"	17 #include "content/public/browser/render_widget_host_view.h"

18 #include "content/public/browser/web_contents.h"	18 #include "content/public/browser/web_contents.h"

19 #include "content/public/common/url_constants.h"	19 #include "content/public/common/url_constants.h"

20	20

21 #if defined(OS_MACOSX)	21 #if defined(OS_MACOSX)

22 #include "base/mac/mac_util.h"	22 #include "base/mac/mac_util.h"

23 #endif	23 #endif

24	24

25 using url::kAboutBlankURL;	25 using url::kAboutBlankURL;

(...skipping 899 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
925	925

926 GURL url = test_server()->GetURL("simple.html");	926 GURL url = test_server()->GetURL("simple.html");

927 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);	927 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);

928	928

929 // Validate that going fullscreen for a URL defaults to asking permision.	929 // Validate that going fullscreen for a URL defaults to asking permision.

930 ASSERT_FALSE(IsFullscreenPermissionRequested());	930 ASSERT_FALSE(IsFullscreenPermissionRequested());

931 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true));	931 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true));

932 ASSERT_TRUE(IsFullscreenPermissionRequested());	932 ASSERT_TRUE(IsFullscreenPermissionRequested());

933 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));	933 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));

934 }	934 }

OLD	NEW