Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/keyboard_overlay/keyboard_overlay_view.h" | 5 #include "ash/keyboard_overlay/keyboard_overlay_view.h" |
| 6 | 6 |
| 7 #include "ash/keyboard_overlay/keyboard_overlay_delegate.h" | 7 #include "ash/keyboard_overlay/keyboard_overlay_delegate.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "content/public/browser/browser_context.h" | 10 #include "content/public/browser/browser_context.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 } | 62 } |
| 63 | 63 |
| 64 aura::Window* KeyboardOverlayView::GetWindow() { | 64 aura::Window* KeyboardOverlayView::GetWindow() { |
| 65 return GetWidget()->GetNativeWindow(); | 65 return GetWidget()->GetNativeWindow(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void KeyboardOverlayView::ShowDialog( | 68 void KeyboardOverlayView::ShowDialog( |
| 69 content::BrowserContext* context, | 69 content::BrowserContext* context, |
| 70 WebContentsHandler* handler, | 70 WebContentsHandler* handler, |
| 71 const GURL& url) { | 71 const GURL& url) { |
| 72 KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate( | 72 ash::KeyboardOverlayDelegate* delegate = new ash::KeyboardOverlayDelegate( |
|
oshima
2012/10/10 20:08:39
Move this class to ash namespace as well.
scottmg
2012/10/10 20:52:01
Done.
| |
| 73 l10n_util::GetStringUTF16(IDS_ASH_KEYBOARD_OVERLAY_TITLE), url); | 73 l10n_util::GetStringUTF16(IDS_ASH_KEYBOARD_OVERLAY_TITLE), url); |
| 74 KeyboardOverlayView* view = | 74 KeyboardOverlayView* view = |
| 75 new KeyboardOverlayView(context, delegate, handler); | 75 new KeyboardOverlayView(context, delegate, handler); |
| 76 delegate->Show(view); | 76 delegate->Show(view); |
| 77 | 77 |
| 78 ash::Shell::GetInstance()->overlay_filter()->Activate(view); | 78 ash::Shell::GetInstance()->overlay_filter()->Activate(view); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void KeyboardOverlayView::WindowClosing() { | 81 void KeyboardOverlayView::WindowClosing() { |
| 82 Cancel(); | 82 Cancel(); |
| 83 } | 83 } |
| OLD | NEW |