Fix declaration vs. implementation ordering in NativeAppWindow{Views|Gtk}

This just reorders the functions in the NativeAppWindow interface. There are
other ordering problems but they aren't worth fixing.

Also move native_app_window.h into apps/ui/.

BUG=306535
TEST=compiles
TBR=benwells@chromium.org for file moves and trivial header path renames

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

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

7 files changed, 21 insertions, 20 deletions

diff --git a/apps/app_shim/extension_app_shim_handler_mac.cc b/apps/app_shim/extension_app_shim_handler_mac.cc
index 9cd2070e..3c08f2d 100644
--- a/apps/app_shim/extension_app_shim_handler_mac.cc
+++ b/apps/app_shim/extension_app_shim_handler_mac.cc
@@ -8,9 +8,9 @@
 #include "apps/app_shim/app_shim_host_manager_mac.h"
 #include "apps/app_shim/app_shim_messages.h"
 #include "apps/launcher.h"
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
+#include "apps/ui/native_app_window.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
diff --git a/apps/app_window_contents.cc b/apps/app_window_contents.cc
index ccafd05..4f11a10 100644
--- a/apps/app_window_contents.cc
+++ b/apps/app_window_contents.cc
@@ -4,7 +4,7 @@
 
 #include "apps/app_window_contents.h"
 
-#include "apps/native_app_window.h"
+#include "apps/ui/native_app_window.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/app_window.h"
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 62f6d896..2b8589a 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -53,7 +53,6 @@
         'launcher.cc',
         'launcher.h',
         'metrics_names.h',
-        'native_app_window.h',
         'pref_names.cc',
         'pref_names.h',
         'prefs.cc',
@@ -70,6 +69,7 @@
         'shell_window_registry.h',
         'switches.cc',
         'switches.h',
+        'ui/native_app_window.h',
         'ui/views/shell_window_frame_view.cc',
         'ui/views/shell_window_frame_view.h',
       ],
diff --git a/apps/shell_window.cc b/apps/shell_window.cc
index e722f4a..6c20a87 100644
--- a/apps/shell_window.cc
+++ b/apps/shell_window.cc
@@ -4,9 +4,9 @@
 
 #include "apps/shell_window.h"
 
-#include "apps/native_app_window.h"
 #include "apps/shell_window_geometry_cache.h"
 #include "apps/shell_window_registry.h"
+#include "apps/ui/native_app_window.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
diff --git a/apps/shell_window_registry.cc b/apps/shell_window_registry.cc
index 677a8c6..c44b924 100644
--- a/apps/shell_window_registry.cc
+++ b/apps/shell_window_registry.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "apps/apps_client.h"
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
+#include "apps/ui/native_app_window.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/common/extensions/extension.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
diff --git a/apps/native_app_window.h b/apps/ui/native_app_window.h
index 8344914..c20e3b1 100644
--- a/apps/native_app_window.h
+++ b/apps/ui/native_app_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APPS_NATIVE_APP_WINDOW_H_
-#define APPS_NATIVE_APP_WINDOW_H_
+#ifndef APPS_UI_NATIVE_APP_WINDOW_H_
+#define APPS_UI_NATIVE_APP_WINDOW_H_
 
 #include "apps/shell_window.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
@@ -18,17 +18,7 @@ namespace apps {
 class NativeAppWindow : public ui::BaseWindow,
                         public web_modal::WebContentsModalDialogHost {
  public:
-  // Called when the draggable regions are changed.
-  virtual void UpdateDraggableRegions(
-      const std::vector<extensions::DraggableRegion>& regions) = 0;
-
-  // Returns the region used by frameless windows for dragging. May return NULL.
-  virtual SkRegion* GetDraggableRegion() = 0;
-
-  // Called when the region that accepts input events is changed.
-  // If |region| is NULL, then the entire window will accept input events.
-  virtual void UpdateInputRegion(scoped_ptr<SkRegion> region) = 0;
-
+  // Fullscreen changes may be asynchronous on some platforms.
   virtual void SetFullscreen(bool fullscreen) = 0;
   virtual bool IsFullscreenOrPending() const = 0;
 
@@ -41,6 +31,17 @@ class NativeAppWindow : public ui::BaseWindow,
   // Called when the title of the window changes.
   virtual void UpdateWindowTitle() = 0;
 
+  // Called when the draggable regions are changed.
+  virtual void UpdateDraggableRegions(
+      const std::vector<extensions::DraggableRegion>& regions) = 0;
+
+  // Returns the region used by frameless windows for dragging. May return NULL.
+  virtual SkRegion* GetDraggableRegion() = 0;
+
+  // Called when the region that accepts input events is changed.
+  // If |region| is NULL, then the entire window will accept input events.
+  virtual void UpdateInputRegion(scoped_ptr<SkRegion> region) = 0;
+
   // Allows the window to handle unhandled keyboard messages coming back from
   // the renderer.
   virtual void HandleKeyboardEvent(
@@ -68,4 +69,4 @@ class NativeAppWindow : public ui::BaseWindow,
 
 }  // namespace apps
 
-#endif  // APPS_NATIVE_APP_WINDOW_H_
+#endif  // APPS_UI_NATIVE_APP_WINDOW_H_
diff --git a/apps/ui/views/shell_window_frame_view.cc b/apps/ui/views/shell_window_frame_view.cc
index 971cb48..fc8e540 100644
--- a/apps/ui/views/shell_window_frame_view.cc
+++ b/apps/ui/views/shell_window_frame_view.cc
@@ -4,7 +4,7 @@
 
 #include "apps/ui/views/shell_window_frame_view.h"
 
-#include "apps/native_app_window.h"
+#include "apps/ui/native_app_window.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/draggable_region.h"
 #include "grit/theme_resources.h"