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

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

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
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/fullscreen.h" 6 #include "chrome/browser/fullscreen.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_commands.h" 9 #include "chrome/browser/ui/browser_commands.h"
10 #include "chrome/browser/ui/browser_window.h" 10 #include "chrome/browser/ui/browser_window.h"
11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" 11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 12 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/test/base/interactive_test_utils.h" 13 #include "chrome/test/base/interactive_test_utils.h"
14 #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" 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)
22 #include "base/mac/mac_util.h"
23 #endif
24
25 using url::kAboutBlankURL; 21 using url::kAboutBlankURL;
26 using content::WebContents; 22 using content::WebContents;
27 using ui::PAGE_TRANSITION_TYPED; 23 using ui::PAGE_TRANSITION_TYPED;
28 24
29 namespace { 25 namespace {
30 26
31 const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html"); 27 const base::FilePath::CharType* kSimpleFile = FILE_PATH_LITERAL("simple.html");
32 28
33 } // namespace 29 } // namespace
34 30
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 917
922 GURL url = test_server()->GetURL("simple.html"); 918 GURL url = test_server()->GetURL("simple.html");
923 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED); 919 AddTabAtIndex(0, url, PAGE_TRANSITION_TYPED);
924 920
925 // Validate that going fullscreen for a URL defaults to asking permision. 921 // Validate that going fullscreen for a URL defaults to asking permision.
926 ASSERT_FALSE(IsFullscreenPermissionRequested()); 922 ASSERT_FALSE(IsFullscreenPermissionRequested());
927 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true)); 923 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(true));
928 ASSERT_TRUE(IsFullscreenPermissionRequested()); 924 ASSERT_TRUE(IsFullscreenPermissionRequested());
929 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false)); 925 ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreenNoRetries(false));
930 } 926 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698