Move //mojo/services/X/public/... to //mojo/services/X/... (part 2).

services/view_manager/display_manager.h

 // 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 SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "mojo/public/cpp/bindings/callback.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/display.mojom.h"
 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 class SurfaceIdAllocator;
 }
 
 namespace mojo {
 class ApplicationConnection;
@@ skipping 56 matching lines @@
   mojo::NativeViewportPtr native_viewport_;
   mojo::Closure native_viewport_closed_callback_;
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_