diff options
| author | andresantoso@chromium.org <andresantoso@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 01:32:51 +0000 |
|---|---|---|
| committer | andresantoso@chromium.org <andresantoso@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 01:32:51 +0000 |
| commit | 3361fae917cb64494369410e94674e551b8882c3 (patch) | |
| tree | d788cfef24e3f0bf4efb1d7b3e55c7c260a3a5d4 /ui/views/examples/examples_window.h | |
| parent | 82c15e474dcfc05a1105e86f9276de9f35dec16b (diff) | |
| download | chromium_src-3361fae917cb64494369410e94674e551b8882c3.zip chromium_src-3361fae917cb64494369410e94674e551b8882c3.tar.gz chromium_src-3361fae917cb64494369410e94674e551b8882c3.tar.bz2 | |
Change the type of InitParams.context from gfx::NativeView to
gfx::NativeWindow.
With aura, gfx::NativeView and gfx::NativeWindow both map to aura::Window.
But on Mac they map to different types (NSWindow and NSView), so they can't
be used interchangeably.
|context| is used to determine the desktop type, and most of the call sites
are looking to pass a window instead of a view.
By changing context's type to gfx::NativeWindow, we get these call sites to
compile with MacViews while maintaining previous behavior with aura.
BUG= 390755
Review URL: https://codereview.chromium.org/387993004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples/examples_window.h')
| -rw-r--r-- | ui/views/examples/examples_window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/examples/examples_window.h b/ui/views/examples/examples_window.h index 89222ef..3393895 100644 --- a/ui/views/examples/examples_window.h +++ b/ui/views/examples/examples_window.h @@ -29,7 +29,7 @@ enum Operation { // window should be created (see |Widget::InitParams::context| for details). VIEWS_EXAMPLES_EXPORT void ShowExamplesWindow( Operation operation, - gfx::NativeView window_context, + gfx::NativeWindow window_context, scoped_ptr<ScopedVector<ExampleBase> > extra_examples); } // namespace examples |