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

Side by Side Diff: chrome/browser/ui/fullscreen/fullscreen_controller.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

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc ('k') | chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/fullscreen/fullscreen_controller.h"	5 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

10 #include "chrome/browser/app_mode/app_mode_utils.h"	10 #include "chrome/browser/app_mode/app_mode_utils.h"

11 #include "chrome/browser/chrome_notification_types.h"	11 #include "chrome/browser/chrome_notification_types.h"

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

13 #include "chrome/browser/download/download_shelf.h"	12 #include "chrome/browser/download/download_shelf.h"

14 #include "chrome/browser/fullscreen.h"	13 #include "chrome/browser/fullscreen.h"

15 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/browser.h"	15 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

18 #include "chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.h"	17 #include "chrome/browser/ui/fullscreen/fullscreen_within_tab_helper.h"

19 #include "chrome/browser/ui/status_bubble.h"	18 #include "chrome/browser/ui/status_bubble.h"

20 #include "chrome/browser/ui/tabs/tab_strip_model.h"	19 #include "chrome/browser/ui/tabs/tab_strip_model.h"

21 #include "chrome/browser/ui/web_contents_sizer.h"	20 #include "chrome/browser/ui/web_contents_sizer.h"

22 #include "chrome/common/chrome_switches.h"	21 #include "chrome/common/chrome_switches.h"

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

23 #include "content/public/browser/navigation_details.h"	23 #include "content/public/browser/navigation_details.h"

24 #include "content/public/browser/navigation_entry.h"	24 #include "content/public/browser/navigation_entry.h"

25 #include "content/public/browser/notification_service.h"	25 #include "content/public/browser/notification_service.h"

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

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

28 #include "content/public/browser/user_metrics.h"	28 #include "content/public/browser/user_metrics.h"

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

30 #include "extensions/common/extension.h"	30 #include "extensions/common/extension.h"

31	31

32 #if defined(OS_MACOSX)	32 #if defined(OS_MACOSX)

(...skipping 725 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
758 (fullscreened_tab_ == mouse_lock_tab_ && IsPrivilegedFullscreenForTab()) ?	758 (fullscreened_tab_ == mouse_lock_tab_ && IsPrivilegedFullscreenForTab()) ?

759 mouse_lock_tab_->GetFullscreenRenderWidgetHostView() : NULL;	759 mouse_lock_tab_->GetFullscreenRenderWidgetHostView() : NULL;

760 if (!mouse_lock_view) {	760 if (!mouse_lock_view) {

761 RenderViewHost* const rvh = mouse_lock_tab_->GetRenderViewHost();	761 RenderViewHost* const rvh = mouse_lock_tab_->GetRenderViewHost();

762 if (rvh)	762 if (rvh)

763 mouse_lock_view = rvh->GetView();	763 mouse_lock_view = rvh->GetView();

764 }	764 }

765 if (mouse_lock_view)	765 if (mouse_lock_view)

766 mouse_lock_view->UnlockMouse();	766 mouse_lock_view->UnlockMouse();

767 }	767 }

OLD	NEW