diff options
22 files changed, 50 insertions, 48 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index a9b1759..4158223 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -108,8 +108,8 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/find_bar/find_bar.h" -#include "chrome/browser/ui/fullscreen_controller.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/browser/ui/login/login_prompt.h" #include "chrome/browser/ui/media_stream_infobar_delegate.h" #include "chrome/browser/ui/omnibox/location_bar.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 7b393a2..7157b87 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -112,7 +112,7 @@ #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_controller.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.h b/chrome/browser/ui/browser.h index c0c0198..39d3b44 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -30,7 +30,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" #include "chrome/browser/ui/select_file_dialog.h" #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" diff --git a/chrome/browser/ui/browser_win.cc b/chrome/browser/ui/browser_win.cc index 118e702..641b38c 100644 --- a/chrome/browser/ui/browser_win.cc +++ b/chrome/browser/ui/browser_win.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/fullscreen_controller.h" +#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" namespace { diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h index ebece44..c074215 100644 --- a/chrome/browser/ui/browser_window.h +++ b/chrome/browser/ui/browser_window.h @@ -10,7 +10,7 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/ui/base_window.h" #include "chrome/browser/ui/bookmarks/bookmark_bar.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" #include "chrome/browser/ui/zoom/zoom_controller.h" #include "chrome/common/content_settings_types.h" diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h index 7afff88..e989a0d 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h @@ -6,7 +6,7 @@ #import "base/mac/cocoa_protocols.h" #include "base/memory/scoped_nsobject.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "googleurl/src/gurl.h" @class BrowserWindowController; diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm index 4f91ca6..5d38d73 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm @@ -18,7 +18,7 @@ #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/fullscreen/OWNERS b/chrome/browser/ui/fullscreen/OWNERS new file mode 100644 index 0000000..557fed8 --- /dev/null +++ b/chrome/browser/ui/fullscreen/OWNERS @@ -0,0 +1 @@ +yzshen@chromium.org diff --git a/chrome/browser/ui/fullscreen_controller.cc b/chrome/browser/ui/fullscreen/fullscreen_controller.cc index c8bdbe6..67e3992 100644 --- a/chrome/browser/ui/fullscreen_controller.cc +++ b/chrome/browser/ui/fullscreen/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_controller.h" +#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "base/bind.h" #include "base/command_line.h" diff --git a/chrome/browser/ui/fullscreen_controller.h b/chrome/browser/ui/fullscreen/fullscreen_controller.h index e6d26c2..0dc697e 100644 --- a/chrome/browser/ui/fullscreen_controller.h +++ b/chrome/browser/ui/fullscreen/fullscreen_controller.h @@ -2,13 +2,13 @@ // 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_CONTROLLER_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_CONTROLLER_H_ +#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ +#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ #pragma once #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -170,4 +170,4 @@ class FullscreenController : public base::RefCounted<FullscreenController>, DISALLOW_COPY_AND_ASSIGN(FullscreenController); }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_CONTROLLER_H_ +#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_H_ diff --git a/chrome/browser/ui/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc index 5181bd2..3aeb2cd 100644 --- a/chrome/browser/ui/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc @@ -9,7 +9,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_controller_test.h" +#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc index cd28ac2..0ba098e 100644 --- a/chrome/browser/ui/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/fullscreen_controller_test.h" +#include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/fullscreen_controller_test.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc index 93829ac..6ce2abe 100644 --- a/chrome/browser/ui/fullscreen_controller_test.cc +++ b/chrome/browser/ui/fullscreen/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_controller_test.h" +#include "chrome/browser/ui/fullscreen/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_controller.h" +#include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_navigation_observer.h" diff --git a/chrome/browser/ui/fullscreen_controller_test.h b/chrome/browser/ui/fullscreen/fullscreen_controller_test.h index e5d665c..83e80a8 100644 --- a/chrome/browser/ui/fullscreen_controller_test.h +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_test.h @@ -2,10 +2,10 @@ // 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_CONTROLLER_TEST_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_CONTROLLER_TEST_H_ +#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_TEST_H_ +#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_TEST_H_ -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -66,4 +66,4 @@ class FullscreenControllerTest : public InProcessBrowserTest { DISALLOW_COPY_AND_ASSIGN(FullscreenControllerTest); }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_CONTROLLER_TEST_H_ +#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_CONTROLLER_TEST_H_ diff --git a/chrome/browser/ui/fullscreen_exit_bubble.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc index cdc0650..f37cb80 100644 --- a/chrome/browser/ui/fullscreen_exit_bubble.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // 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_exit_bubble.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ui/fullscreen_exit_bubble.h b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h index 31cf3fd7..1d76595 100644 --- a/chrome/browser/ui/fullscreen_exit_bubble.h +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h @@ -2,13 +2,13 @@ // 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_EXIT_BUBBLE_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_EXIT_BUBBLE_H_ +#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_H_ +#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_H_ #pragma once #include "base/timer.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "googleurl/src/gurl.h" #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/point.h" @@ -106,4 +106,4 @@ class FullscreenExitBubble : public ui::AnimationDelegate { FullscreenExitBubbleType bubble_type_; }; -#endif // CHROME_BROWSER_UI_FULLSCREEN_EXIT_BUBBLE_H_ +#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_H_ diff --git a/chrome/browser/ui/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc index c5a8565..044ba23 100644 --- a/chrome/browser/ui/fullscreen_exit_bubble_type.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_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_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/fullscreen_exit_bubble_type.h b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h index bdfd133..0d16809 100644 --- a/chrome/browser/ui/fullscreen_exit_bubble_type.h +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_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_EXIT_BUBBLE_TYPE_H_ -#define CHROME_BROWSER_UI_FULLSCREEN_EXIT_BUBBLE_TYPE_H_ +#ifndef CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_TYPE_H_ +#define CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_TYPE_H_ #pragma once #include "base/string16.h" @@ -18,8 +18,9 @@ class ExtensionService; enum FullscreenExitBubbleType { FEB_TYPE_NONE = 0, - // For tab fullscreen mode. (More comments about tab and browser fullscreen - // mode can be found in chrome/browser/ui/fullscreen_controller.h.) + // For tab fullscreen mode. + // More comments about tab and browser fullscreen mode can be found in + // chrome/browser/ui/fullscreen/fullscreen_controller.h. FEB_TYPE_FULLSCREEN_BUTTONS, FEB_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS, FEB_TYPE_MOUSELOCK_BUTTONS, @@ -45,4 +46,4 @@ void PermissionRequestedByType(FullscreenExitBubbleType type, } // namespace fullscreen_bubble -#endif // CHROME_BROWSER_UI_FULLSCREEN_EXIT_BUBBLE_TYPE_H_ +#endif // CHROME_BROWSER_UI_FULLSCREEN_FULLSCREEN_EXIT_BUBBLE_TYPE_H_ diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h index a35c682..505a511 100644 --- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h +++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_GTK_FULLSCREEN_EXIT_BUBBLE_GTK_H_ #pragma once -#include "chrome/browser/ui/fullscreen_exit_bubble.h" -#include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/browser/ui/gtk/slide_animator_gtk.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/gtk_signal_registrar.h" diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.h b/chrome/browser/ui/views/fullscreen_exit_bubble_views.h index 0c08fb7..73b049a 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.h +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/ui/fullscreen_exit_bubble.h" +#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h" class GURL; namespace ui { diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 6facd79..2f0a408 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2906,12 +2906,12 @@ 'browser/ui/find_bar/find_notification_details.h', 'browser/ui/find_bar/find_tab_helper.cc', 'browser/ui/find_bar/find_tab_helper.h', - 'browser/ui/fullscreen_controller.cc', - 'browser/ui/fullscreen_controller.h', - 'browser/ui/fullscreen_exit_bubble.cc', - 'browser/ui/fullscreen_exit_bubble.h', - 'browser/ui/fullscreen_exit_bubble_type.cc', - 'browser/ui/fullscreen_exit_bubble_type.h', + 'browser/ui/fullscreen/fullscreen_controller.cc', + 'browser/ui/fullscreen/fullscreen_controller.h', + 'browser/ui/fullscreen/fullscreen_exit_bubble.cc', + 'browser/ui/fullscreen/fullscreen_exit_bubble.h', + 'browser/ui/fullscreen/fullscreen_exit_bubble_type.cc', + 'browser/ui/fullscreen/fullscreen_exit_bubble_type.h', 'browser/ui/gesture_prefs_observer_factory_aura.cc', 'browser/ui/gesture_prefs_observer_factory_aura.h', 'browser/ui/global_error/global_error.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d985a22..2993924 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -167,8 +167,8 @@ 'browser/ui/browser.h', 'browser/ui/cocoa/run_loop_testing.h', 'browser/ui/cocoa/run_loop_testing.mm', - 'browser/ui/fullscreen_controller_test.cc', - 'browser/ui/fullscreen_controller_test.h', + 'browser/ui/fullscreen/fullscreen_controller_test.cc', + 'browser/ui/fullscreen/fullscreen_controller_test.h', 'browser/ui/panels/base_panel_browser_test.cc', 'browser/ui/panels/base_panel_browser_test.h', 'browser/ui/panels/old_base_panel_browser_test.cc', @@ -483,7 +483,7 @@ 'browser/instant/instant_browsertest.cc', 'browser/printing/print_dialog_cloud_interative_uitest.cc', 'browser/task_manager/task_manager_browsertest_util.cc', - 'browser/ui/fullscreen_controller_interactive_browsertest.cc', + 'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc', 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc', 'browser/ui/omnibox/omnibox_view_browsertest.cc', 'browser/ui/panels/detached_panel_browsertest.cc', @@ -2892,7 +2892,7 @@ 'browser/ui/cocoa/applescript/window_applescript_test.mm', 'browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm', 'browser/ui/find_bar/find_bar_host_browsertest.cc', - 'browser/ui/fullscreen_controller_browsertest.cc', + 'browser/ui/fullscreen/fullscreen_controller_browsertest.cc', 'browser/ui/global_error/global_error_service_browsertest.cc', 'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc', 'browser/ui/gtk/view_id_util_browsertest.cc', |