diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 22:57:32 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 22:57:32 +0000 |
| commit | 17155b8750a67f6acd57a6918a6abba013a09854 (patch) | |
| tree | 2088174fa62555effcb4f4b7b1d99b07c620c007 /ash/keyboard_overlay | |
| parent | bbc79d3644aa567aab26bb7a080fb1b725c44592 (diff) | |
| download | chromium_src-17155b8750a67f6acd57a6918a6abba013a09854.zip chromium_src-17155b8750a67f6acd57a6918a6abba013a09854.tar.gz chromium_src-17155b8750a67f6acd57a6918a6abba013a09854.tar.bz2 | |
Elim Shell:browser_context
This is some cleanup from another CL where I discovered that
Shell::Get()->browser_context() isn't actually used by Chrome, only by
ash_shell. To eliminate that confusion I eliminated it and changed the
ash_shell code to rely on delegate()->GetCurrentBrowserContext() to be
consistent with Chrome.
BUG=none
R=ben@chromium.org, jamescook@chromium.org
Review URL: https://codereview.chromium.org/59153009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/keyboard_overlay')
| -rw-r--r-- | ash/keyboard_overlay/keyboard_overlay_view_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc b/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc index 87afe05..aaf8789 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc +++ b/ash/keyboard_overlay/keyboard_overlay_view_unittest.cc @@ -9,6 +9,7 @@ #include "ash/accelerators/accelerator_table.h" #include "ash/keyboard_overlay/keyboard_overlay_delegate.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" #include "ash/test/ash_test_base.h" #include "ui/web_dialogs/test/test_web_contents_handler.h" #include "ui/web_dialogs/test/test_web_dialog_delegate.h" @@ -26,7 +27,7 @@ bool operator==(const KeyboardOverlayView::KeyEventData& lhs, TEST_F(KeyboardOverlayViewTest, OpenAcceleratorsClose) { ui::test::TestWebDialogDelegate delegate(GURL("chrome://keyboardoverlay")); KeyboardOverlayView view( - Shell::GetInstance()->browser_context(), + Shell::GetInstance()->delegate()->GetCurrentBrowserContext(), &delegate, new ui::test::TestWebContentsHandler); for (size_t i = 0; i < kAcceleratorDataLength; ++i) { |