Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1344)

Unified Diff: ash/keyboard_overlay/keyboard_overlay_view.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix new addition Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/keyboard_overlay/keyboard_overlay_view.h ('k') | ash/launcher/overflow_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 37d83537b2fdd5d3ece0b0e266f04e356cda632d..a52ace143c464142a9f975c569fe7a8b9d76e77b 100644
--- a/ash/keyboard_overlay/keyboard_overlay_view.cc
+++ b/ash/keyboard_overlay/keyboard_overlay_view.cc
@@ -31,6 +31,8 @@ const struct KeyEventData {
}
+namespace ash {
+
KeyboardOverlayView::KeyboardOverlayView(
content::BrowserContext* context,
WebDialogDelegate* delegate,
@@ -42,7 +44,7 @@ KeyboardOverlayView::~KeyboardOverlayView() {
}
void KeyboardOverlayView::Cancel() {
- ash::Shell::GetInstance()->overlay_filter()->Deactivate();
+ Shell::GetInstance()->overlay_filter()->Deactivate();
views::Widget* widget = GetWidget();
if (widget)
widget->Close();
@@ -75,9 +77,11 @@ void KeyboardOverlayView::ShowDialog(
new KeyboardOverlayView(context, delegate, handler);
delegate->Show(view);
- ash::Shell::GetInstance()->overlay_filter()->Activate(view);
+ Shell::GetInstance()->overlay_filter()->Activate(view);
}
void KeyboardOverlayView::WindowClosing() {
Cancel();
}
+
+} // namespace ash
« no previous file with comments | « ash/keyboard_overlay/keyboard_overlay_view.h ('k') | ash/launcher/overflow_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698