MacViews: Gets views_examples_with_content_exe compiling on Mac

This splits views_content_client_main_parts_* into versions for
ChromeOS, Mac and Desktop Aura, with a per-platform Create(..) function.
ChromeOS and Desktop Aura sharing a common Aura part.

desktop_test_views_delegate.cc is moved to an _aura version, and a _mac
version added.

views_content_client now loads content_resources.pak to access sandbox
profiles required for mac.

A macviews_builder target is added to expose
views_examples_with_content_exe on Mac, and to give the fyi trybot
something to build.

BUG=366007

Review URL: https://codereview.chromium.org/297143009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274775 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 4 deletions

diff --git a/ui/views/examples/examples.gyp b/ui/views/examples/examples.gyp
index aa41cd0..4cf3a1b 100644
--- a/ui/views/examples/examples.gyp
+++ b/ui/views/examples/examples.gyp
@@ -14,7 +14,6 @@
         '../../../skia/skia.gyp:skia',
         '../../../third_party/icu/icu.gyp:icui18n',
         '../../../third_party/icu/icu.gyp:icuuc',
-        '../../aura/aura.gyp:aura',
         '../../base/ui_base.gyp:ui_base',
         '../../events/events.gyp:events',
         '../../gfx/gfx.gyp:gfx',
@@ -90,6 +89,11 @@
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
+        ['use_aura==1', {
+          'dependencies': [
+            '../../aura/aura.gyp:aura',
+          ],
+        }],
       ],
     },  # target_name: views_examples_lib
     {
@@ -98,7 +102,6 @@
       'dependencies': [
         '../../../base/base.gyp:base',
         '../../../base/base.gyp:base_i18n',
-        '../../aura/aura.gyp:aura',
         '../../base/ui_base.gyp:ui_base',
         '../../compositor/compositor.gyp:compositor',
         '../../compositor/compositor.gyp:compositor_test_support',
@@ -111,6 +114,13 @@
       'sources': [
         'examples_main.cc',
       ],
+      'conditions': [
+        ['use_aura==1', {
+          'dependencies': [
+            '../../aura/aura.gyp:aura',
+          ],
+        }],
+      ],
     },  # target_name: views_examples_exe
     {
       'target_name': 'views_examples_with_content_lib',
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 55f7b554..5547444 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -210,7 +210,7 @@ class ExamplesWindowContents : public WidgetDelegateView,
 ExamplesWindowContents* ExamplesWindowContents::instance_ = NULL;
 
 void ShowExamplesWindow(Operation operation,
-                        aura::Window* window_context,
+                        gfx::NativeView window_context,
                         ScopedExamples extra_examples) {
   if (ExamplesWindowContents::instance()) {
     ExamplesWindowContents::instance()->GetWidget()->Activate();
diff --git a/ui/views/examples/examples_window.h b/ui/views/examples/examples_window.h
index ba910e1..89222ef 100644
--- a/ui/views/examples/examples_window.h
+++ b/ui/views/examples/examples_window.h
@@ -7,6 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/views/examples/views_examples_export.h"
 
 namespace aura {
@@ -28,7 +29,7 @@ enum Operation {
 // window should be created (see |Widget::InitParams::context| for details).
 VIEWS_EXAMPLES_EXPORT void ShowExamplesWindow(
     Operation operation,
-    aura::Window* window_context,
+    gfx::NativeView window_context,
     scoped_ptr<ScopedVector<ExampleBase> > extra_examples);
 
 }  // namespace examples