diff options
author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
---|---|---|
committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
commit | ffabb1ea75e662308da91e916a0ffc922525aa18 (patch) | |
tree | 788b1ac84169a936b02d10feda6c94efaee129ea /ash/keyboard_overlay/keyboard_overlay_view.h | |
parent | c856e976800426511cd1a0f74d38c1fa7c883018 (diff) | |
download | chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.zip chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.gz chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.bz2 |
Makes gfx::Screen an instance, rather than a collection of static methods.
This is in support of supporting separate Screen implementations on Aura for desktop and metro on Windows.
Some callsites are not yet correct, and noted with a reference to the http://crbug.com/133312. As-is those sites will behave the same as before this patch, but may not be correct once desktop/metro can run simultaneously.
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11030017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/keyboard_overlay/keyboard_overlay_view.h')
-rw-r--r-- | ash/keyboard_overlay/keyboard_overlay_view.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/keyboard_overlay/keyboard_overlay_view.h b/ash/keyboard_overlay/keyboard_overlay_view.h index 0409d8b..d83cb13 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view.h +++ b/ash/keyboard_overlay/keyboard_overlay_view.h @@ -20,6 +20,8 @@ namespace ui { class WebDialogDelegate; } +namespace ash { + // A customized dialog view for the keyboard overlay. class ASH_EXPORT KeyboardOverlayView : public views::WebDialogView, @@ -47,4 +49,6 @@ class ASH_EXPORT KeyboardOverlayView DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayView); }; +} // namespace ash + #endif // ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_ |