summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authoryukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-03 17:02:47 +0000
committeryukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-03 17:02:47 +0000
commitd012be2ba345e689347d409432729472de325cd3 (patch)
tree5adfbb8da90226246081c5320ddc222e8b1ca050 /apps
parentc80b3502ba5dda8c0fa8f712f585aa1aad45f385 (diff)
downloadchromium_src-d012be2ba345e689347d409432729472de325cd3.zip
chromium_src-d012be2ba345e689347d409432729472de325cd3.tar.gz
chromium_src-d012be2ba345e689347d409432729472de325cd3.tar.bz2
Makes text input extensions available in guest session on CrOS.
The behavioral changes are: 1) Creates background pages of extensions in guest session even if the extension is not "split" mode. Since the guest session has only the off-the-record context and does not have a regular context, we should treat the off-the-record context like the default regular context. Even if the extension is "spanning" mode, creates a background page for the off-the-record context in guest session. Otherwise, extensions in guest session cannot have a background page. 2) Passs key events, etc. to the off-the-record context regardless of whether extensions are enabled in incognito mode or not. The reason is the same. We should treat the off-the-record context as the default regular context in guest session. BUG=339318 TEST=Done manually. 1) Log in as guest, 2) Add Japanese language and enable Google Japanese Input, 3) Activate one of Japanese input method, 4) Type something. Review URL: https://codereview.chromium.org/177533002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/shell/browser/shell_extensions_browser_client.cc3
-rw-r--r--apps/shell/browser/shell_extensions_browser_client.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc
index 2c9a56f..d1079e5 100644
--- a/apps/shell/browser/shell_extensions_browser_client.cc
+++ b/apps/shell/browser/shell_extensions_browser_client.cc
@@ -82,7 +82,8 @@ BrowserContext* ShellExtensionsBrowserClient::GetOriginalContext(
return context;
}
-bool ShellExtensionsBrowserClient::IsGuestSession(BrowserContext* context) {
+bool ShellExtensionsBrowserClient::IsGuestSession(
+ BrowserContext* context) const {
return false;
}
diff --git a/apps/shell/browser/shell_extensions_browser_client.h b/apps/shell/browser/shell_extensions_browser_client.h
index 206d189..d900394 100644
--- a/apps/shell/browser/shell_extensions_browser_client.h
+++ b/apps/shell/browser/shell_extensions_browser_client.h
@@ -33,7 +33,7 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
content::BrowserContext* context) OVERRIDE;
virtual content::BrowserContext* GetOriginalContext(
content::BrowserContext* context) OVERRIDE;
- virtual bool IsGuestSession(content::BrowserContext* context) OVERRIDE;
+ virtual bool IsGuestSession(content::BrowserContext* context) const OVERRIDE;
virtual bool IsExtensionIncognitoEnabled(
const std::string& extension_id,
content::BrowserContext* context) const OVERRIDE;