diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 21:29:00 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 21:29:00 +0000 |
| commit | 8340eda5f5a5c725de29419739fbdef59d3cfcc4 (patch) | |
| tree | 78d69454566a54b9ab95d19b19f711d2db70f02c /mojo/examples/aura_demo | |
| parent | 00c51dc84d6b1cc306ca188b20f350280109890a (diff) | |
| download | chromium_src-8340eda5f5a5c725de29419739fbdef59d3cfcc4.zip chromium_src-8340eda5f5a5c725de29419739fbdef59d3cfcc4.tar.gz chromium_src-8340eda5f5a5c725de29419739fbdef59d3cfcc4.tar.bz2 | |
Revert 258077 "Remove PrepareForShutdown"
Broke Linux official builder:
http://build.chromium.org/p/chromium/builders/Linux/builds/48352/steps/compile/logs/stdio
../../apps/shell/browser/shell_browser_main_parts.cc:197:42:error: 'class aura::WindowEventDispatcher' has no member named 'PrepareForShutdown'
ninja: build stopped: subcommand failed.
> Remove PrepareForShutdown
> Filter events after shutdown in event filter instead.
>
> BUG=None
>
> Review URL: https://codereview.chromium.org/196573023
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/205313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/aura_demo')
| -rw-r--r-- | mojo/examples/aura_demo/window_tree_host_mojo.cc | 4 | ||||
| -rw-r--r-- | mojo/examples/aura_demo/window_tree_host_mojo.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.cc b/mojo/examples/aura_demo/window_tree_host_mojo.cc index b032323..815cce66 100644 --- a/mojo/examples/aura_demo/window_tree_host_mojo.cc +++ b/mojo/examples/aura_demo/window_tree_host_mojo.cc @@ -128,6 +128,10 @@ void WindowTreeHostMojo::OnDeviceScaleFactorChanged(float device_scale_factor) { NOTIMPLEMENTED(); } +void WindowTreeHostMojo::PrepareForShutdown() { + NOTIMPLEMENTED(); +} + void WindowTreeHostMojo::SetCursorNative(gfx::NativeCursor cursor) { NOTIMPLEMENTED(); } diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.h b/mojo/examples/aura_demo/window_tree_host_mojo.h index 79dd9db3..fd146d2 100644 --- a/mojo/examples/aura_demo/window_tree_host_mojo.h +++ b/mojo/examples/aura_demo/window_tree_host_mojo.h @@ -49,6 +49,7 @@ class WindowTreeHostMojo : public aura::WindowTreeHost, virtual void UnConfineCursor() OVERRIDE; virtual void PostNativeEvent(const base::NativeEvent& native_event) OVERRIDE; virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; + virtual void PrepareForShutdown() OVERRIDE; virtual void SetCursorNative(gfx::NativeCursor cursor) OVERRIDE; virtual void MoveCursorToNative(const gfx::Point& location) OVERRIDE; virtual void OnCursorVisibilityChangedNative(bool show) OVERRIDE; |