Revert of Window prerequisites for ShelfWindowWatcher panel support.

components/exo/shell_surface.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 COMPONENTS_EXO_SHELL_SURFACE_H_
 #define COMPONENTS_EXO_SHELL_SURFACE_H_
 
 #include <deque>
 #include <memory>
 #include <string>
@@ skipping 106 matching lines @@
   void SetPinned(bool pinned, bool trusted);
 
   // Set title for surface.
   void SetTitle(const base::string16& title);
 
   // Sets the system modality.
   void SetSystemModal(bool system_modal);
 
   // 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.
   void Move();
 
   // Start an interactive resize of surface. |component| is one of the windows
   // HT constants (see ui/base/hit_test.h) and describes in what direction the
   // surface should be resized.
   void Resize(int component);
 
@@ skipping 126 matching lines @@
 
   views::Widget* widget_ = nullptr;
   Surface* surface_;
   aura::Window* parent_;
   const gfx::Rect initial_bounds_;
   const bool activatable_;
   // Container Window Id (see ash/public/cpp/shell_window_ids.h)
   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;
   double pending_scale_ = 1.0;
   base::Closure close_callback_;
   base::Closure surface_destroyed_callback_;
   StateChangedCallback state_changed_callback_;
   ConfigureCallback configure_callback_;
   ScopedConfigure* scoped_configure_ = nullptr;
   bool ignore_window_bounds_changes_ = false;
@@ skipping 12 matching lines @@
   int top_inset_height_ = 0;
   int pending_top_inset_height_ = 0;
   float rectangular_shadow_background_opacity_ = 1.0;
 
   DISALLOW_COPY_AND_ASSIGN(ShellSurface);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_SHELL_SURFACE_H_