Restructure contents of blimp/client.

blimp/client/app/linux/blimp_display_manager.h

 // Copyright 2015 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 BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_
-#define BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_
+#ifndef BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_
+#define BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
@@ skipping 41 matching lines @@
 
   scoped_ptr<BlimpCompositor> blimp_compositor_;
   scoped_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager);
 };
 
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_
+#endif  // BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_