Revert of Window prerequisites for ShelfWindowWatcher panel support.

components/exo/shell_surface.h

Index: components/exo/shell_surface.h
diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h
index 4991cec668f35af1e98f54276cf492bf5616e2a6..511a57cbffbca9a94e54b96981da226680a6334b 100644
--- a/components/exo/shell_surface.h
+++ b/components/exo/shell_surface.h
@@ -124,10 +124,11 @@
 
   // Sets the application ID for the window. The application ID identifies the
   // general class of applications to which the window belongs.
-  static void SetApplicationId(aura::Window* window, const std::string& id);
+  static void SetApplicationId(aura::Window* window,
+                               std::string* application_id);
   static const std::string GetApplicationId(aura::Window* window);
 
-  // Set the application ID for the surface.
+  // Set application id for surface.
   void SetApplicationId(const std::string& application_id);
 
   // Start an interactive move of surface.
@@ -274,6 +275,7 @@
   const int container_;
   bool pending_show_widget_ = false;
   base::string16 title_;
+  std::string application_id_;
   gfx::Rect geometry_;
   gfx::Rect pending_geometry_;
   double scale_ = 1.0;