Revert of Window prerequisites for ShelfWindowWatcher panel support.

components/exo/shell_surface.cc

 // 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.
 
 #include "components/exo/shell_surface.h"
 
 #include <algorithm>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 25 matching lines @@
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow.h"
 #include "ui/wm/core/shadow_controller.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/chromeos_sounds.h"
 #endif
 
+DECLARE_WINDOW_PROPERTY_TYPE(std::string*)
+
 namespace exo {
 namespace {
 
 // This is a struct for accelerator keys used to close ShellSurfaces.
 const struct Accelerator {
   ui::KeyboardCode keycode;
   int modifiers;
 } kCloseWindowAccelerators[] = {
     {ui::VKEY_W, ui::EF_CONTROL_DOWN},
     {ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN},
@@ skipping 264 matching lines @@
     aura::Window* window = shell_surface_->widget_->GetNativeWindow();
     DCHECK_EQ(window->GetProperty(aura::client::kAnimationsDisabledKey), true);
     window->SetProperty(aura::client::kAnimationsDisabledKey,
                         saved_animations_disabled_);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellSurface, public:
 
+DEFINE_LOCAL_WINDOW_PROPERTY_KEY(std::string*, kApplicationIdKey, nullptr)
 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Surface*, kMainSurfaceKey, nullptr)
 
 ShellSurface::ShellSurface(Surface* surface,
                            ShellSurface* parent,
                            const gfx::Rect& initial_bounds,
                            bool activatable,
                            int container)
     : widget_(nullptr),
       surface_(surface),
       parent_(parent ? parent->GetWidget()->GetNativeWindow() : nullptr),
@@ skipping 182 matching lines @@
         << "Only a window in SystemModalContainer can change the modality";
     return;
   }
   widget_->GetNativeWindow()->SetProperty(
       aura::client::kModalKey,
       system_modal ? ui::MODAL_TYPE_SYSTEM : ui::MODAL_TYPE_NONE);
 }
 
 // static
 void ShellSurface::SetApplicationId(aura::Window* window,
-                                    const std::string& id) {
-  TRACE_EVENT1("exo", "ShellSurface::SetApplicationId", "application_id", id);
-  window->SetProperty(aura::client::kAppIdKey, new std::string(id));
+                                    std::string* application_id) {
+  window->SetProperty(kApplicationIdKey, application_id);
 }
 
 // static
 const std::string ShellSurface::GetApplicationId(aura::Window* window) {
-  std::string* string_ptr = window->GetProperty(aura::client::kAppIdKey);
+  std::string* string_ptr = window->GetProperty(kApplicationIdKey);
   return string_ptr ? *string_ptr : std::string();
 }
 
 void ShellSurface::SetApplicationId(const std::string& application_id) {
-  SetApplicationId(widget_->GetNativeWindow(), application_id);
+  TRACE_EVENT1("exo", "ShellSurface::SetApplicationId", "application_id",
+               application_id);
+
+  application_id_ = application_id;
 }
 
 void ShellSurface::Move() {
   TRACE_EVENT0("exo", "ShellSurface::Move");
 
   if (widget_ && !widget_->movement_disabled())
     AttemptToStartDrag(HTCAPTION);
 }
 
 void ShellSurface::Resize(int component) {
@@ skipping 59 matching lines @@
 // static
 Surface* ShellSurface::GetMainSurface(const aura::Window* window) {
   return window->GetProperty(kMainSurfaceKey);
 }
 
 std::unique_ptr<base::trace_event::TracedValue> ShellSurface::AsTracedValue()
     const {
   std::unique_ptr<base::trace_event::TracedValue> value(
       new base::trace_event::TracedValue());
   value->SetString("title", base::UTF16ToUTF8(title_));
-  std::string application_id;
-  if (GetWidget() && GetWidget()->GetNativeWindow())
-    application_id = GetApplicationId(GetWidget()->GetNativeWindow());
-  value->SetString("application_id", application_id);
+  value->SetString("application_id", application_id_);
   return value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SurfaceDelegate overrides:
 
 void ShellSurface::OnSurfaceCommit() {
   surface_->CheckIfSurfaceHierarchyNeedsCommitToNewSurfaces();
   surface_->CommitSurfaceHierarchy();
 
@@ skipping 376 matching lines @@
                                    : views::Widget::InitParams::ACTIVATABLE_NO;
 
   // Note: NativeWidget owns this widget.
   widget_ = new ShellSurfaceWidget(this);
   widget_->Init(params);
 
   aura::Window* window = widget_->GetNativeWindow();
   window->SetName("ExoShellSurface");
   window->AddChild(surface_->window());
   window->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter(widget_)));
+  SetApplicationId(window, &application_id_);
   SetMainSurface(window, surface_);
 
   // Start tracking changes to window bounds and window state.
   window->AddObserver(this);
   ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
   window_state->AddObserver(this);
 
   // Absolete positioned shell surfaces may request the bounds that does not
   // fill the entire work area / display in maximized / fullscreen state.
   // Allow such clients to update the bounds in these states.
@@ skipping 361 matching lines @@
       shadow_overlay_->layer()->Add(shadow->layer());
       window->AddChild(shadow_overlay_);
       shadow_overlay_->Show();
     }
     shadow_overlay_->SetBounds(shadow_bounds);
     shadow->SetContentBounds(gfx::Rect(shadow_bounds.size()));
   }
 }
 
 }  // namespace exo