| 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/exclusive_access/fullscreen_controller.h" | 5 #include "chrome/browser/ui/exclusive_access/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/location.h" | 9 #include "base/location.h" | 
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 25 #include "content/public/browser/navigation_details.h" | 25 #include "content/public/browser/navigation_details.h" | 
| 26 #include "content/public/browser/navigation_entry.h" | 26 #include "content/public/browser/navigation_entry.h" | 
| 27 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" | 
| 28 #include "content/public/browser/render_view_host.h" | 28 #include "content/public/browser/render_view_host.h" | 
| 29 #include "content/public/browser/render_widget_host_view.h" | 29 #include "content/public/browser/render_widget_host_view.h" | 
| 30 #include "content/public/browser/user_metrics.h" | 30 #include "content/public/browser/user_metrics.h" | 
| 31 #include "content/public/browser/web_contents.h" | 31 #include "content/public/browser/web_contents.h" | 
| 32 #include "extensions/common/extension.h" | 32 #include "extensions/common/extension.h" | 
| 33 | 33 | 
| 34 #if !defined(OS_MACOSX) | 34 #if !defined(OS_MACOSX) | 
| 35 #include "base/prefs/pref_service.h" |  | 
| 36 #include "chrome/common/pref_names.h" | 35 #include "chrome/common/pref_names.h" | 
|  | 36 #include "components/prefs/pref_service.h" | 
| 37 #endif | 37 #endif | 
| 38 | 38 | 
| 39 using base::UserMetricsAction; | 39 using base::UserMetricsAction; | 
| 40 using content::RenderViewHost; | 40 using content::RenderViewHost; | 
| 41 using content::WebContents; | 41 using content::WebContents; | 
| 42 | 42 | 
| 43 FullscreenController::FullscreenController(ExclusiveAccessManager* manager) | 43 FullscreenController::FullscreenController(ExclusiveAccessManager* manager) | 
| 44     : ExclusiveAccessControllerBase(manager), | 44     : ExclusiveAccessControllerBase(manager), | 
| 45       state_prior_to_tab_fullscreen_(STATE_INVALID), | 45       state_prior_to_tab_fullscreen_(STATE_INVALID), | 
| 46       tab_fullscreen_accepted_(false), | 46       tab_fullscreen_accepted_(false), | 
| (...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 601     return fullscreened_origin_; | 601     return fullscreened_origin_; | 
| 602 | 602 | 
| 603   return exclusive_access_tab()->GetLastCommittedURL(); | 603   return exclusive_access_tab()->GetLastCommittedURL(); | 
| 604 } | 604 } | 
| 605 | 605 | 
| 606 GURL FullscreenController::GetEmbeddingOrigin() const { | 606 GURL FullscreenController::GetEmbeddingOrigin() const { | 
| 607   DCHECK(exclusive_access_tab()); | 607   DCHECK(exclusive_access_tab()); | 
| 608 | 608 | 
| 609   return exclusive_access_tab()->GetLastCommittedURL(); | 609   return exclusive_access_tab()->GetLastCommittedURL(); | 
| 610 } | 610 } | 
| OLD | NEW | 
|---|