| Index: ash/keyboard_overlay/keyboard_overlay_view.cc
|
| diff --git a/ash/keyboard_overlay/keyboard_overlay_view.cc b/ash/keyboard_overlay/keyboard_overlay_view.cc
|
| index 2847653ca57630f0ddf4bbb1804315998379d173..e5a71f9a2453fd17f7132c876ac56a7f3519bdaa 100644
|
| --- a/ash/keyboard_overlay/keyboard_overlay_view.cc
|
| +++ b/ash/keyboard_overlay/keyboard_overlay_view.cc
|
| @@ -43,7 +43,7 @@ KeyboardOverlayView::~KeyboardOverlayView() {
|
| }
|
|
|
| void KeyboardOverlayView::Cancel() {
|
| - Shell::GetInstance()->overlay_filter()->Deactivate();
|
| + Shell::GetInstance()->overlay_filter()->Deactivate(this);
|
| views::Widget* widget = GetWidget();
|
| if (widget)
|
| widget->Close();
|
| @@ -66,10 +66,14 @@ aura::Window* KeyboardOverlayView::GetWindow() {
|
| return GetWidget()->GetNativeWindow();
|
| }
|
|
|
| +// static
|
| void KeyboardOverlayView::ShowDialog(
|
| content::BrowserContext* context,
|
| WebContentsHandler* handler,
|
| const GURL& url) {
|
| + if (Shell::GetInstance()->overlay_filter()->IsActive())
|
| + return;
|
| +
|
| KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate(
|
| l10n_util::GetStringUTF16(IDS_ASH_KEYBOARD_OVERLAY_TITLE), url);
|
| KeyboardOverlayView* view =
|
|
|