diff options
author | sriramsr <sriramsr@chromium.org> | 2014-12-18 11:25:29 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-18 19:26:02 +0000 |
commit | 3e76a4134e2168a43f8c70532221d09bfd098871 (patch) | |
tree | ef41fbe80afe867af490425af21cf0f246a906a1 | |
parent | 1fef3ffc00485992f70a3ccce57f89538718c513 (diff) | |
download | chromium_src-3e76a4134e2168a43f8c70532221d09bfd098871.zip chromium_src-3e76a4134e2168a43f8c70532221d09bfd098871.tar.gz chromium_src-3e76a4134e2168a43f8c70532221d09bfd098871.tar.bz2 |
Rename fullscreen directory to exclusive_access as well.
BUG=166928
Review URL: https://codereview.chromium.org/808813003
Cr-Commit-Position: refs/heads/master@{#309055}
44 files changed, 98 insertions, 97 deletions
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc index c5c14e5..cbc64ea 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/extensions/api/cast_streaming/performance_test.cc b/chrome/browser/extensions/api/cast_streaming/performance_test.cc index 32b360c..b497221 100644 --- a/chrome/browser/extensions/api/cast_streaming/performance_test.cc +++ b/chrome/browser/extensions/api/cast_streaming/performance_test.cc @@ -18,7 +18,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/test/base/test_launcher_utils.h" diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc index 301db45..be53b76 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/test/base/test_launcher_utils.h" diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 5b5687d..bf1752f 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -501,12 +501,12 @@ source_set("test_support") { "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm", "cocoa/run_loop_testing.h", "cocoa/run_loop_testing.mm", + "exclusive_access/fullscreen_controller_state_test.cc", + "exclusive_access/fullscreen_controller_state_test.h", + "exclusive_access/fullscreen_controller_state_tests.h", + "exclusive_access/fullscreen_controller_test.cc", + "exclusive_access/fullscreen_controller_test.h", "find_bar/find_bar_host_unittest_util.h", - "fullscreen/fullscreen_controller_state_test.cc", - "fullscreen/fullscreen_controller_state_test.h", - "fullscreen/fullscreen_controller_state_tests.h", - "fullscreen/fullscreen_controller_test.cc", - "fullscreen/fullscreen_controller_test.h", "login/login_prompt_test_utils.cc", "login/login_prompt_test_utils.h", "passwords/manage_passwords_ui_controller_mock.cc", diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 446d9f4..e4a22e9 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -105,11 +105,11 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/chrome_select_file_policy.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/fast_unload_controller.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "chrome/browser/ui/global_error/global_error.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 6e54930..4992f92 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -40,10 +40,10 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "chrome/browser/ui/location_bar/location_bar.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/browser/ui/search/search_tab_helper.h" diff --git a/chrome/browser/ui/browser_commands_mac.cc b/chrome/browser/ui/browser_commands_mac.cc index 16644d0..39b257d 100644 --- a/chrome/browser/ui/browser_commands_mac.cc +++ b/chrome/browser/ui/browser_commands_mac.cc @@ -9,7 +9,7 @@ #include "chrome/browser/fullscreen.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/common/chrome_switches.h" namespace chrome { diff --git a/chrome/browser/ui/browser_win.cc b/chrome/browser/ui/browser_win.cc index 0e471a6b..d655621f 100644 --- a/chrome/browser/ui/browser_win.cc +++ b/chrome/browser/ui/browser_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" void Browser::SetMetroSnapMode(bool enable) { fullscreen_controller_->SetMetroSnapMode(enable); diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h index d10067e..a7e8d93 100644 --- a/chrome/browser/ui/browser_window.h +++ b/chrome/browser/ui/browser_window.h @@ -11,7 +11,7 @@ #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/ui/bookmarks/bookmark_bar.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index fd73da9..d855913 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -47,7 +47,7 @@ #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h" #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/search/search_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/web_applications/web_app.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 5f13cb6..52e4c42 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -69,7 +69,7 @@ #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/translate/translate_bubble_controller.h" #include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/location_bar/location_bar.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index ee44baf..0acc1f3 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -38,7 +38,7 @@ #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/render_widget_host_view.h" diff --git a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h index fda0854..0b13e6c 100644 --- a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h +++ b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "url/gurl.h" @class BrowserWindowController; diff --git a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm index 05e7b0a..ff03c65 100644 --- a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm +++ b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm @@ -17,8 +17,8 @@ #import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_registry.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/fullscreen/OWNERS b/chrome/browser/ui/exclusive_access/OWNERS index e5e13cb..e5e13cb 100644 --- a/chrome/browser/ui/fullscreen/OWNERS +++ b/chrome/browser/ui/exclusive_access/OWNERS diff --git a/chrome/browser/ui/fullscreen/exclusive_access_bubble.cc b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc index 0497b38..c04aa3cf 100644 --- a/chrome/browser/ui/fullscreen/exclusive_access_bubble.cc +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_registry.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/fullscreen/exclusive_access_bubble.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h index ec6094f..6386327 100644 --- a/chrome/browser/ui/fullscreen/exclusive_access_bubble.h +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_H_ +#ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_H_ +#define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_H_ #include "base/timer/timer.h" -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/point.h" #include "url/gurl.h" @@ -115,4 +115,4 @@ class ExclusiveAccessBubble : public gfx::AnimationDelegate { DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessBubble); }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_H_ +#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_H_ diff --git a/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc index f52bf87..3b5dfc1 100644 --- a/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.cc +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h index 4a292aa..3163b70 100644 --- a/chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_ +#ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_ +#define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_ #include "base/strings/string16.h" #include "url/gurl.h" @@ -21,7 +21,7 @@ enum ExclusiveAccessBubbleType { // For tab fullscreen mode. // More comments about tab and browser fullscreen mode can be found in - // chrome/browser/ui/fullscreen/fullscreen_controller.h. + // chrome/browser/ui/exclusive_access/fullscreen_controller.h. EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_BUTTONS, EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS, EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS, @@ -47,4 +47,4 @@ void PermissionRequestedByType(ExclusiveAccessBubbleType type, } // namespace exclusive_access_bubble -#endif // CHROME_BROWSER_UI_FULLSCREEN_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_ +#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_TYPE_H_ diff --git a/chrome/browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc index 030456b..6dbd08c 100644 --- a/chrome/browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/ppapi/ppapi_test.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc index 35578e1..6655469 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "base/bind.h" #include "base/command_line.h" @@ -13,7 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h" #include "chrome/browser/ui/status_bubble.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/web_contents_sizer.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h index aa4cb27..955754c 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ +#ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ +#define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ #include <set> #include "base/basictypes.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -257,4 +257,4 @@ class FullscreenController : public content::NotificationObserver { DISALLOW_COPY_AND_ASSIGN(FullscreenController); }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ +#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc index 1cac631..b76ad92 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc @@ -8,8 +8,8 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc index fe3e579..5e26e89 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc index 32e575f..f30eb5b 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc @@ -6,9 +6,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" @@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, // Progress of tests can be examined by inserting the following line: // LOG(INFO) << GetAndClearDebugLog(); } -#include "chrome/browser/ui/fullscreen/fullscreen_controller_state_tests.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_tests.h" // Specific one-off tests for known issues ------------------------------------- diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc index dac1301..77dad56 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_test.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h" #include <memory.h> @@ -12,8 +12,8 @@ #include "chrome/browser/fullscreen.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h index 0ede54e..26fef64 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_STATE_TEST_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_STATE_TEST_H_ +#ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_STATE_TEST_H_ +#define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_STATE_TEST_H_ #include <sstream> @@ -216,4 +216,4 @@ class FullscreenControllerStateTest { DISALLOW_COPY_AND_ASSIGN(FullscreenControllerStateTest); }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_STATE_TEST_H_ +#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_STATE_TEST_H_ diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_tests.h b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_tests.h index ed8931d..0fe15fa 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_tests.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_tests.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_STATE_TESTS_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_STATE_TESTS_H_ +#ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_STATE_TESTS_H_ +#define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_STATE_TESTS_H_ // Macros used to create individual tests for all state and event pairs. // To be included in the middle of a test .cc file just after a definition for @@ -44,4 +44,4 @@ TEST_ALL_EVENTS(STATE_TO_BROWSER_FULLSCREEN_NO_CHROME); TEST_ALL_EVENTS(STATE_TO_BROWSER_FULLSCREEN_WITH_CHROME); TEST_ALL_EVENTS(STATE_TO_TAB_FULLSCREEN); -#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_STATE_TESTS_H_ +#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_STATE_TESTS_H_ diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc index f28fabd..148affd 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc @@ -6,8 +6,8 @@ #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_state_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/web_contents.h" @@ -346,7 +346,7 @@ TEST_F(FullscreenControllerStateUnitTest, TransitionsForEachState) { // Progress of tests can be examined by inserting the following line: // LOG(INFO) << GetAndClearDebugLog(); } -#include "chrome/browser/ui/fullscreen/fullscreen_controller_state_tests.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_tests.h" // Specific one-off tests for known issues ------------------------------------- diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc index e1fd97f..bf1925f 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "base/command_line.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_test.h b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.h index 916baec..59928b2 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_test.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_TEST_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_TEST_H_ +#ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_TEST_H_ +#define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_TEST_H_ #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble_type.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" @@ -61,4 +61,4 @@ class FullscreenControllerTest : public InProcessBrowserTest { DISALLOW_COPY_AND_ASSIGN(FullscreenControllerTest); }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_TEST_H_ +#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_TEST_H_ diff --git a/chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.cc b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc index 1e20ec5..374318a 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h" DEFINE_WEB_CONTENTS_USER_DATA_KEY(FullscreenWithinTabHelper); diff --git a/chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.h b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h index bc9935a..694f89e 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WITHIN_TAB_HELPER_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WITHIN_TAB_HELPER_H_ +#ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_WITHIN_TAB_HELPER_H_ +#define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_WITHIN_TAB_HELPER_H_ #include "content/public/browser/web_contents_user_data.h" @@ -43,4 +43,4 @@ class FullscreenWithinTabHelper DISALLOW_COPY_AND_ASSIGN(FullscreenWithinTabHelper); }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_WITHIN_TAB_HELPER_H_ +#endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_WITHIN_TAB_HELPER_H_ diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.cc b/chrome/browser/ui/views/exclusive_access_bubble_views.cc index b5b5e68..94fa862 100644 --- a/chrome/browser/ui/views/exclusive_access_bubble_views.cc +++ b/chrome/browser/ui/views/exclusive_access_bubble_views.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/frame/top_container_view.h" diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.h b/chrome/browser/ui/views/exclusive_access_bubble_views.h index f7e22e6..5b187bd 100644 --- a/chrome/browser/ui/views/exclusive_access_bubble_views.h +++ b/chrome/browser/ui/views/exclusive_access_bubble_views.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/ui/fullscreen/exclusive_access_bubble.h" +#include "chrome/browser/ui/exclusive_access/exclusive_access_bubble.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/views/widget/widget_observer.h" diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc index d53d323..e862fc4 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc @@ -13,8 +13,8 @@ #include "base/command_line.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/tabs/tab.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc index 6060263..664a4d2 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc @@ -8,7 +8,7 @@ #include "ash/wm/immersive_revealed_lock.h" #include "ash/wm/window_state.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/top_container_view.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc index f213daa..701997e 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc @@ -13,8 +13,8 @@ #include "base/command_line.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser_commands.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/test_with_browser_view.h" #include "chrome/browser/ui/views/frame/top_container_view.h" diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc b/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc index e76c8cc..2e9df11 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" #include "chrome/browser/ui/browser_commands.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc index 28a7585e..36ecd1f 100644 --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc @@ -7,7 +7,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" #include "chrome/browser/ui/passwords/save_password_refusal_combobox_model.h" diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 8e2fffa..267b5d9 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -1442,18 +1442,18 @@ 'browser/ui/content_settings/content_setting_media_menu_model.h', 'browser/ui/elide_url.cc', 'browser/ui/elide_url.h', + 'browser/ui/exclusive_access/exclusive_access_bubble.cc', + 'browser/ui/exclusive_access/exclusive_access_bubble.h', + 'browser/ui/exclusive_access/exclusive_access_bubble_type.cc', + 'browser/ui/exclusive_access/exclusive_access_bubble_type.h', + 'browser/ui/exclusive_access/fullscreen_controller.cc', + 'browser/ui/exclusive_access/fullscreen_controller.h', + 'browser/ui/exclusive_access/fullscreen_within_tab_helper.cc', + 'browser/ui/exclusive_access/fullscreen_within_tab_helper.h', 'browser/ui/fast_unload_controller.cc', 'browser/ui/fast_unload_controller.h', 'browser/ui/find_bar/find_bar_controller.cc', 'browser/ui/find_bar/find_bar_controller.h', - 'browser/ui/fullscreen/exclusive_access_bubble.cc', - 'browser/ui/fullscreen/exclusive_access_bubble.h', - 'browser/ui/fullscreen/exclusive_access_bubble_type.cc', - 'browser/ui/fullscreen/exclusive_access_bubble_type.h', - 'browser/ui/fullscreen/fullscreen_controller.cc', - 'browser/ui/fullscreen/fullscreen_controller.h', - 'browser/ui/fullscreen/fullscreen_within_tab_helper.cc', - 'browser/ui/fullscreen/fullscreen_within_tab_helper.h', 'browser/ui/infobar_container_delegate.cc', 'browser/ui/infobar_container_delegate.h', 'browser/ui/location_bar/location_bar.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 806b329..52c2afa 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -623,8 +623,8 @@ 'browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm', 'browser/ui/cocoa/view_id_util_browsertest.mm', 'browser/ui/content_settings/content_setting_bubble_model_browsertest.cc', + 'browser/ui/exclusive_access/fullscreen_controller_browsertest.cc', 'browser/ui/find_bar/find_bar_host_browsertest.cc', - 'browser/ui/fullscreen/fullscreen_controller_browsertest.cc', 'browser/ui/global_error/global_error_service_browsertest.cc', 'browser/ui/login/login_prompt_browsertest.cc', 'browser/ui/location_bar/location_bar_browsertest.cc', @@ -870,10 +870,10 @@ 'browser/ui/browser_focus_uitest.cc', 'browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc', 'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm', + 'browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc', + 'browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc', + 'browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc', 'browser/ui/find_bar/find_bar_host_interactive_uitest.cc', - 'browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc', - 'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc', - 'browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc', 'browser/ui/omnibox/omnibox_view_browsertest.cc', 'browser/ui/panels/base_panel_browser_test.cc', 'browser/ui/panels/base_panel_browser_test.h', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 57ffd27..4fc818d 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1140,8 +1140,8 @@ 'browser/ui/content_settings/content_setting_bubble_model_unittest.cc', 'browser/ui/content_settings/content_setting_image_model_unittest.cc', 'browser/ui/elide_url_unittest.cc', + 'browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc', 'browser/ui/find_bar/find_backend_unittest.cc', - 'browser/ui/fullscreen/fullscreen_controller_state_unittest.cc', 'browser/ui/global_error/global_error_service_unittest.cc', 'browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2_unittest.cc', 'browser/ui/location_bar/origin_chip_info_unittest.cc', @@ -1583,12 +1583,12 @@ 'browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm', 'browser/ui/cocoa/run_loop_testing.h', 'browser/ui/cocoa/run_loop_testing.mm', + 'browser/ui/exclusive_access/fullscreen_controller_state_test.cc', + 'browser/ui/exclusive_access/fullscreen_controller_state_test.h', + 'browser/ui/exclusive_access/fullscreen_controller_state_tests.h', + 'browser/ui/exclusive_access/fullscreen_controller_test.cc', + 'browser/ui/exclusive_access/fullscreen_controller_test.h', 'browser/ui/find_bar/find_bar_host_unittest_util.h', - 'browser/ui/fullscreen/fullscreen_controller_state_test.cc', - 'browser/ui/fullscreen/fullscreen_controller_state_test.h', - 'browser/ui/fullscreen/fullscreen_controller_state_tests.h', - 'browser/ui/fullscreen/fullscreen_controller_test.cc', - 'browser/ui/fullscreen/fullscreen_controller_test.h', 'browser/ui/login/login_prompt_test_utils.cc', 'browser/ui/login/login_prompt_test_utils.h', 'browser/ui/passwords/manage_passwords_ui_controller_mock.cc', @@ -2629,8 +2629,8 @@ 'browser/ui/browser_iterator_unittest.cc', # URL elider is not used on android. 'browser/ui/elide_url_unittest.cc', - 'browser/ui/fullscreen/fullscreen_controller_state_unittest.cc', - 'browser/ui/fullscreen/fullscreen_controller_unittest.cc', + 'browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc', + 'browser/ui/exclusive_access/fullscreen_controller_unittest.cc', 'browser/ui/search/instant_page_unittest.cc', 'browser/ui/search/instant_search_prerenderer_unittest.cc', 'browser/ui/search/search_delegate_unittest.cc', diff --git a/ppapi/tests/test_flash_fullscreen_for_browser_ui.h b/ppapi/tests/test_flash_fullscreen_for_browser_ui.h index 4e253f3..5c1a263 100644 --- a/ppapi/tests/test_flash_fullscreen_for_browser_ui.h +++ b/ppapi/tests/test_flash_fullscreen_for_browser_ui.h @@ -19,7 +19,8 @@ // the Pepper APIs. Instead, this is a simulated Flash plugin, used to place // the browser window and other UI elements into Flash Fullscreen mode for // layout, event, focus, etc. testing. See -// chrome/browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc. +// chrome/browser/ui/exclusive_access/ +// flash_fullscreen_interactive_browsertest.cc. // // At start, this simulated Flash plugin will enter fullscreen and paint a green // color fill. From there, it will respond to mouse clicks or key presses by |