summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_view.h
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 03:15:34 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 03:15:34 +0000
commit6f637730a38de10a1173f05e48271483d27b648d (patch)
tree44bacffdd54e6b8d28215b4a7ccd9a06bbeb88ef /ash/launcher/launcher_view.h
parente48c61d39a63a10675af85eb9417ed453eea6a6a (diff)
downloadchromium_src-6f637730a38de10a1173f05e48271483d27b648d.zip
chromium_src-6f637730a38de10a1173f05e48271483d27b648d.tar.gz
chromium_src-6f637730a38de10a1173f05e48271483d27b648d.tar.bz2
Aura Shell needs to exist on Mac
Adds first cut at "Aura Shell.app" on Mac. The 'ash_shell' is extended to generate a Cocoa application. This application brings up a single window containing the Aura desktop. The main view of this window provides an accelerated surface to Aura in which it can composite and draw its results. What works: - The application launches and renders the Aura desktop and background - Mouse movement, clicking, double-clicking, and interactions with Aura windows and widgets - Text buttons render with Skia text (needs improvement) - Non-modal transient window button - Window-modal window button - System-modal window button - Example Widgets button (checkboxes, radios, buttons) - Lock Screen button - Create Non-Resizable window button - Create Pointy Bubble button - Create Widow button - Switcher and Taskbar What doesn't work: - Open Views Examples Window button - Views menus - Views scrollbars - Views accelerators - Views tooltips - Drag and drop - Anything involving MessageLoop dispatcher logic - Mouse movement doesn't pass through to Aura when mouse button is up Note: Required .gyp flags are: 'use_aura': 1, 'use_webkit_compositor': 1, BUG=109946 TEST=Manual tests. R=sky@chromium.org, thakis@chromium.org Review URL: https://chromiumcodereview.appspot.com/9232028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_view.h')
-rw-r--r--ash/launcher/launcher_view.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index 8d0db48..afe2679 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -138,7 +138,9 @@ class LauncherView : public views::WidgetDelegateView,
// Index |drag_view_| was initially at.
int start_drag_index_;
+#if !defined(OS_MACOSX)
scoped_ptr<views::MenuRunner> overflow_menu_runner_;
+#endif
// Used to handle cycling among windows.
scoped_ptr<LauncherWindowCycler> cycler_;