diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 23:43:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 23:43:50 +0000 |
| commit | 97eb75a026e1b4c0b919b68e78093e639aac0d7b (patch) | |
| tree | a8a97010a38c6b718b554b23018a502ddd04eb19 /ash/shell/keyboard_controller_proxy_stub.cc | |
| parent | b7f6916987b3562cbc685af95030e29e588738d9 (diff) | |
| download | chromium_src-97eb75a026e1b4c0b919b68e78093e639aac0d7b.zip chromium_src-97eb75a026e1b4c0b919b68e78093e639aac0d7b.tar.gz chromium_src-97eb75a026e1b4c0b919b68e78093e639aac0d7b.tar.bz2 | |
Rename CurrentBrowserContext to ActiveBrowserContext
Remove use of GetDefaultProfileXXX in
- c/b/ui/ash/chrome_shell_delegate*
- c/b/ui/ash/keyboard_controller_proxy.cc
- c/b/ui/ash/screenshot_taker.cc
BUG=322682
Review URL: https://codereview.chromium.org/112153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/keyboard_controller_proxy_stub.cc')
| -rw-r--r-- | ash/shell/keyboard_controller_proxy_stub.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/keyboard_controller_proxy_stub.cc b/ash/shell/keyboard_controller_proxy_stub.cc index 9ebe37b..556e7aa 100644 --- a/ash/shell/keyboard_controller_proxy_stub.cc +++ b/ash/shell/keyboard_controller_proxy_stub.cc @@ -28,7 +28,8 @@ aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() { } BrowserContext* KeyboardControllerProxyStub::GetBrowserContext() { - return Shell::GetInstance()->delegate()->GetCurrentBrowserContext(); + // TODO(oshima): investigate which profile to use. + return Shell::GetInstance()->delegate()->GetActiveBrowserContext(); } ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() { |