summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2015-04-24 05:30:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-24 12:30:52 +0000
commit9a3c81efb05232657d8df6a11db2ef8f8f64fd7f (patch)
treeed9de7cb4698bc74e0cb203c677342c8d5281438 /extensions/shell
parent733a3f04a20043a7afb55c1a25d14dbaf869b913 (diff)
downloadchromium_src-9a3c81efb05232657d8df6a11db2ef8f8f64fd7f.zip
chromium_src-9a3c81efb05232657d8df6a11db2ef8f8f64fd7f.tar.gz
chromium_src-9a3c81efb05232657d8df6a11db2ef8f8f64fd7f.tar.bz2
GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate
The CL does the following: 1. Replace GuestViewManager::FromBrowserContext with GuestViewManager::CreateWithDelegate. 2. Rename GuestViewManager::FromBrowserContextIfAvailable to GuestViewManager::FromBrowserContxt. 3. Creates a GuestViewManagerDelegate interface and ExtensionsGuestViewManagerDelegate. 4. GuestViewManager is created with a particular delegate implementation. 5. GuestView permission checks and registration is moved to the ExtensionsGuestViewDelegate. 6. owner_extension_id() is renamed to owner_host(). After this patch the following classes can be moved to Components (once GuestViewEvent is decoupled from EventRouter): 1. GuestViewManager 2. GuestViewManagerDelegate 3. GuestViewBase 4. GuestViewMessageFilter 5. GuestView BUG=444869 TBR=noms@chromium.org for chrome/browser/profiles, nkostylev@chromium.org chrome/browser/chromeos/login, thestig@chromium.org for chrome/browser/printing. Review URL: https://codereview.chromium.org/1066563006 Cr-Commit-Position: refs/heads/master@{#326774}
Diffstat (limited to 'extensions/shell')
-rw-r--r--extensions/shell/browser/shell_browser_context.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/shell/browser/shell_browser_context.cc b/extensions/shell/browser/shell_browser_context.cc
index 61aec77..827eabe 100644
--- a/extensions/shell/browser/shell_browser_context.cc
+++ b/extensions/shell/browser/shell_browser_context.cc
@@ -35,7 +35,7 @@ ShellBrowserContext::~ShellBrowserContext() {
}
content::BrowserPluginGuestManager* ShellBrowserContext::GetGuestManager() {
- return GuestViewManager::FromBrowserContextIfAvailable(this);
+ return GuestViewManager::FromBrowserContext(this);
}
storage::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {