Add kApplicationIdKey for ShellSurface::GetApplicationId and SetApplicationId

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/frame/custom_frame_view_ash.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 295 matching lines @@
     window->SetProperty(aura::client::kAnimationsDisabledKey,
                         saved_animations_disabled_);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellSurface, public:
 
 DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY(Surface*, kMainSurfaceKey, nullptr)
 
+namespace {

[reveman, 2017/05/17 15:31:06]

nit: for consistency, please remove this namespace here or move to unnamed
namespace at the top of the file along with the kMainSurfaceKey

[yawano, 2017/05/18 02:06:28]

Done. Moved it to the anonymous namespace at the top as I want to put
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY in anonymous namespace. Unlike
DEFINE_LOCAL_UI_CLASS_PROPERTY_KEY, it doesn't put it in anonymous namespace.

+
+// An application Id which is set by a wayland server. This property is not

[reveman, 2017/05/17 15:31:06]

This code should not be referring to wayland. How about "Application Id set by
the client." ?

[yawano, 2017/05/18 02:06:28]

Done.

+// exported.
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(std::string, kExoAppIdKey, nullptr);
+
+}  // namespace
+
 ShellSurface::ShellSurface(Surface* surface,
                            ShellSurface* parent,
                            BoundsMode bounds_mode,
                            const gfx::Point& origin,
                            bool activatable,
                            bool can_minimize,
                            int container)
     : widget_(nullptr),
       surface_(surface),
       parent_(parent ? parent->GetWidget()->GetNativeWindow() : nullptr),
@@ skipping 222 matching lines @@
   DCHECK_EQ(container_, ash::kShellWindowId_SystemModalContainer);
   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);
-  const ash::ShelfID shelf_id(id);
-  window->SetProperty(ash::kShelfIDKey, new std::string(shelf_id.Serialize()));
+  window->SetProperty(kExoAppIdKey, new std::string(id));
 }
 
 // static
 const std::string ShellSurface::GetApplicationId(aura::Window* window) {

[reveman, 2017/05/17 15:31:06]

can this return a pointer instead so we don't have to make a copy of the string?

[yawano, 2017/05/18 02:06:28]

Done.

-  return ash::ShelfID::Deserialize(window->GetProperty(ash::kShelfIDKey))
-      .app_id;
+  std::string* string_ptr = window->GetProperty(kExoAppIdKey);
+  return string_ptr ? *string_ptr : std::string();
 }
 
 void ShellSurface::SetApplicationId(const std::string& application_id) {
   // Store the value in |application_id_| in case the window does not exist yet.
   application_id_ = application_id;
   if (widget_ && widget_->GetNativeWindow())
     SetApplicationId(widget_->GetNativeWindow(), application_id);
 }
 
 void ShellSurface::Move() {
@@ skipping 1161 matching lines @@
 gfx::Point ShellSurface::GetMouseLocation() const {
   aura::Window* const root_window = widget_->GetNativeWindow()->GetRootWindow();
   gfx::Point location =
       root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot();
   aura::Window::ConvertPointToTarget(
       root_window, widget_->GetNativeWindow()->parent(), &location);
   return location;
 }
 
 }  // namespace exo