diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 20:21:13 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 20:21:13 +0000 |
| commit | 2b4cd30636e2e17528135b3332c3536ca2da5633 (patch) | |
| tree | 476f60ff2fe41b01a0413b1120319ad4c9761080 /ui/aura | |
| parent | 76fa749a64733060e553da96ab1d2325cc02bb43 (diff) | |
| download | chromium_src-2b4cd30636e2e17528135b3332c3536ca2da5633.zip chromium_src-2b4cd30636e2e17528135b3332c3536ca2da5633.tar.gz chromium_src-2b4cd30636e2e17528135b3332c3536ca2da5633.tar.bz2 | |
Aura: Remove dynamic switching into and out of compact mode
Going forward we'll select compact mode based on command line flags passed by the session manager. Compact mode should go away entirely when Aura is more mature, so we don't need to maintain the ability to switch modes. This patch simplifies the Shell setup code and updates the Shell unit tests to match.
BUG=115314
TEST=aura_shell_unittests, specifically Shell*
Review URL: http://codereview.chromium.org/9452028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/env.h | 2 | ||||
| -rw-r--r-- | ui/aura/gestures/gesture_point.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ui/aura/env.h b/ui/aura/env.h index a4fee63..feba8ed 100644 --- a/ui/aura/env.h +++ b/ui/aura/env.h @@ -16,8 +16,10 @@ namespace aura { class EnvObserver; class Window; +#if !defined(OS_MACOSX) // Creates a platform-specific native event dispatcher. MessageLoop::Dispatcher* CreateDispatcher(); +#endif // A singleton object that tracks general state within Aura. // TODO(beng): manage RootWindows. diff --git a/ui/aura/gestures/gesture_point.h b/ui/aura/gestures/gesture_point.h index a3a46db..b04ffbd 100644 --- a/ui/aura/gestures/gesture_point.h +++ b/ui/aura/gestures/gesture_point.h @@ -54,7 +54,7 @@ class GesturePoint { const gfx::Point& last_touch_position() const { return last_touch_position_; } void set_touch_id(unsigned int touch_id) { touch_id_ = touch_id; } - const unsigned int touch_id() const { return touch_id_; } + unsigned int touch_id() const { return touch_id_; } double x_delta() const { return last_touch_position_.x() - first_touch_position_.x(); |