ozone: Move public files to ui/ozone/public & update public DEPS

We'll only export files from ui/ozone/public to other, higher-level
components. In particular the files from ui/ozone/common and
ui/ozone/platform are private.

BUG=none
TEST=desktop build with use_ozone=1 chromeos=1

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

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

chrome/browser/chromeos/login/chrome_restart_request.cc

@@ -44,7 +44,7 @@
 #include "ui/events/event_switches.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
-#include "ui/ozone/ozone_switches.h"
+#include "ui/ozone/public/ozone_switches.h"
 #include "ui/wm/core/wm_core_switches.h"
 #include "url/gurl.h"
 

content/DEPS

@@ -86,7 +86,7 @@ include_rules = [
   "+ui/gfx",
   "+ui/gl",
   "+ui/native_theme",
-  "+ui/ozone",
+  "+ui/ozone/public",
   "+ui/shell_dialogs",
   "+ui/snapshot",
   "+ui/surface",

content/browser/DEPS

@@ -68,9 +68,6 @@ include_rules = [
   # These should be burned down. http://crbug.com/237267
   "!third_party/WebKit/public/web/mac/WebInputEventFactory.h",
 
-  "+ui/ozone/ozone_platform.h",
-  "+ui/ozone/ozone_switches.h",
-
   # DO NOT ADD ANY CHROME OR COMPONENTS INCLUDES HERE!!!
   # See https://sites.google.com/a/chromium.org/dev/developers/content-module
   # for more information.

content/browser/gpu/gpu_process_host.cc

@@ -51,7 +51,7 @@
 #endif
 
 #if defined(USE_OZONE)
-#include "ui/ozone/ozone_switches.h"
+#include "ui/ozone/public/ozone_switches.h"
 #endif
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)

content/browser/gpu/gpu_process_host_ui_shim.cc

@@ -21,8 +21,8 @@
 #include "content/public/browser/browser_thread.h"
 
 #if defined(USE_OZONE)
-#include "ui/ozone/ozone_platform.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace content {

content/gpu/gpu_child_thread.cc

@@ -20,8 +20,8 @@
 #include "ui/gl/gl_implementation.h"
 
 #if defined(USE_OZONE)
-#include "ui/ozone/ozone_platform.h"
 #include "ui/ozone/public/gpu_platform_support.h"
+#include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace content {

ui/aura/DEPS

@@ -7,7 +7,7 @@ include_rules = [
   "+ui/gfx",
   "+ui/metro_viewer",  # TODO(beng): investigate moving remote_root_window_host
                        #             to ui/metro_viewer.
-  "+ui/ozone",
+  "+ui/ozone/public",
   "+ui/wm/public",
 ]
 

ui/aura/env.cc

@@ -12,7 +12,7 @@
 #include "ui/events/platform/platform_event_source.h"
 
 #if defined(USE_OZONE)
-#include "ui/ozone/ozone_platform.h"
+#include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace aura {

ui/display/chromeos/ozone/DEPS

 include_rules = [
-  "+ui/ozone",
+  "+ui/ozone/public",
 ]

ui/display/chromeos/ozone/display_configurator_ozone.cc

@@ -7,7 +7,7 @@
 #include "ui/display/chromeos/touchscreen_delegate_impl.h"
 #include "ui/display/types/chromeos/native_display_delegate.h"
 #include "ui/display/types/chromeos/touchscreen_device_manager.h"
-#include "ui/ozone/ozone_platform.h"
+#include "ui/ozone/public/ozone_platform.h"
 
 namespace ui {
 

ui/gl/DEPS

@@ -4,5 +4,5 @@ include_rules = [
   "+third_party/skia",
   "+ui/events",
   "+ui/gfx",
-  "+ui/ozone",
+  "+ui/ozone/public",
 ]

ui/gl/gl_implementation_ozone.cc

@@ -10,7 +10,7 @@
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_implementation_osmesa.h"
 #include "ui/gl/gl_osmesa_api_implementation.h"
-#include "ui/ozone/ozone_platform.h"
+#include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace gfx {

ui/ozone/demo/egl_demo.cc

@@ -8,7 +8,7 @@
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
-#include "ui/ozone/ozone_platform.h"
+#include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 int main(int argc, char** argv) {

ui/ozone/ozone.gyp

@@ -100,10 +100,10 @@
         'common/gpu/ozone_gpu_message_params.cc',
         'common/gpu/ozone_gpu_message_params.h',
         'common/gpu/ozone_gpu_messages.h',
-        'ozone_platform.cc',
-        'ozone_platform.h',
-        'ozone_switches.cc',
-        'ozone_switches.h',
+        'public/ozone_platform.cc',
+        'public/ozone_platform.h',
+        'public/ozone_switches.cc',
+        'public/ozone_switches.h',
         'platform_selection.cc',
         'platform_selection.h',
         '<@(external_ozone_platform_files)',
@@ -153,7 +153,7 @@
             '--output_cc=<(constructor_list_cc_file)',
             '--namespace=ui',
             '--typename=OzonePlatform',
-            '--include="ui/ozone/ozone_platform.h"'
+            '--include="ui/ozone/public/ozone_platform.h"'
           ],
         },
       ],

ui/ozone/platform/caca/ozone_platform_caca.cc

@@ -4,11 +4,11 @@
 
 #include "ui/ozone/platform/caca/ozone_platform_caca.h"
 
-#include "ui/ozone/ozone_platform.h"
 #include "ui/ozone/platform/caca/caca_connection.h"
 #include "ui/ozone/platform/caca/caca_event_factory.h"
 #include "ui/ozone/platform/caca/caca_surface_factory.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
+#include "ui/ozone/public/ozone_platform.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/ozone/common/chromeos/native_display_delegate_ozone.h"

ui/ozone/platform/dri/ozone_platform_dri.cc

@@ -8,7 +8,6 @@
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
-#include "ui/ozone/ozone_platform.h"
 #include "ui/ozone/platform/dri/cursor_factory_evdev_dri.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_surface_factory.h"
@@ -16,6 +15,7 @@
 #include "ui/ozone/platform/dri/scanout_surface.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/platform/dri/virtual_terminal_manager.h"
+#include "ui/ozone/public/ozone_platform.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h"

ui/ozone/platform/dri/ozone_platform_gbm.cc

@@ -11,7 +11,6 @@
 #include "base/at_exit.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
-#include "ui/ozone/ozone_platform.h"
 #include "ui/ozone/platform/dri/cursor_factory_evdev_dri.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/gbm_surface.h"
@@ -24,6 +23,7 @@
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/ozone/public/gpu_platform_support.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/ozone_platform.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h"

ui/ozone/platform/egltest/ozone_platform_egltest.cc

@@ -12,11 +12,11 @@
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/gfx/vsync_provider.h"
-#include "ui/ozone/ozone_platform.h"
-#include "ui/ozone/ozone_switches.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/ozone/public/gpu_platform_support.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/ozone_switches.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 

ui/ozone/platform/test/ozone_platform_test.cc

@@ -8,12 +8,12 @@
 #include "base/files/file_path.h"
 #include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
-#include "ui/ozone/ozone_platform.h"
-#include "ui/ozone/ozone_switches.h"
 #include "ui/ozone/platform/test/file_surface_factory.h"
 #include "ui/ozone/platform/test/test_cursor_factory.h"
 #include "ui/ozone/public/gpu_platform_support.h"
 #include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/ozone_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/ozone/common/chromeos/native_display_delegate_ozone.h"

ui/ozone/platform_selection.cc

@@ -6,8 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "ui/ozone/ozone_switches.h"
 #include "ui/ozone/platform_list.h"
+#include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
 

ui/ozone/public/DEPS

-include_rules = [
-  "+skia/ext",
-]

ui/ozone/ozone_platform.cc → ui/ozone/public/ozone_platform.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,10 +6,10 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "ui/events/device_data_manager.h"
-#include "ui/ozone/ozone_platform.h"
-#include "ui/ozone/ozone_switches.h"
 #include "ui/ozone/platform_object.h"
 #include "ui/ozone/platform_selection.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
 

ui/ozone/ozone_platform.h → ui/ozone/public/ozone_platform.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_OZONE_PLATFORM_H_
-#define UI_OZONE_OZONE_PLATFORM_H_
+#ifndef UI_OZONE_PUBLIC_OZONE_PLATFORM_H_
+#define UI_OZONE_PUBLIC_OZONE_PLATFORM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/ozone/ozone_export.h"
@@ -74,4 +74,4 @@ class OZONE_EXPORT OzonePlatform {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_OZONE_PLATFORM_H_
+#endif  // UI_OZONE_PUBLIC_OZONE_PLATFORM_H_

ui/ozone/ozone_switches.cc → ui/ozone/public/ozone_switches.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ozone/ozone_switches.h"
+#include "ui/ozone/public/ozone_switches.h"
 
 namespace switches {
 

ui/ozone/ozone_switches.h → ui/ozone/public/ozone_switches.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_OZONE_SWITCHES_H_
-#define UI_OZONE_OZONE_SWITCHES_H_
+#ifndef UI_OZONE_PUBLIC_OZONE_SWITCHES_H_
+#define UI_OZONE_PUBLIC_OZONE_SWITCHES_H_
 
 #include "base/compiler_specific.h"
 #include "ui/ozone/ozone_export.h"
@@ -16,4 +16,4 @@ OZONE_EXPORT extern const char kOzoneDumpFile[];
 
 }  // namespace switches
 
-#endif  // UI_OZONE_OZONE_SWITCHES_H_
+#endif  // UI_OZONE_PUBLIC_OZONE_SWITCHES_H_

ui/views/DEPS

@@ -13,7 +13,7 @@ include_rules = [
   "+ui/gfx",
   "+ui/gl/gl_surface.h",  # To initialize GL for tests.
   "+ui/native_theme",
-  "+ui/ozone",
+  "+ui/ozone/public",
   "+ui/wm/core",
   "+ui/wm/public",