exo: Add ShellSurface::SetApplicationId.

exo: Add ShellSurface::SetApplicationId.

The application ID identifies the general class of applications to which
the surface belongs. Chromium can use this to group multiple surfaces
together, or to determine how to launch a new application.

BUG=549781
TEST=exo_unittest --gtest_filter=ShellSurfaceTest.SetApplicationId

Committed: https://crrev.com/936be6f74b610c83c41f426a8fad5270507c02f6
Cr-Commit-Position: refs/heads/master@{#362930}

[reveman, 2015-12-02 07:39:57]

The CQ bit was checked by reveman@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-12-02 07:40:11]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1491843002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1491843002/1

[commit-bot: I haz the power, 2015-12-02 07:59:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-02 07:59:09]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[reveman, 2015-12-02 10:11:01]

The CQ bit was checked by reveman@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-12-02 10:11:05]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1491843002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1491843002/20001

[commit-bot: I haz the power, 2015-12-02 10:34:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-02 10:34:41]

Dry run: This issue passed the CQ dry run.

[reveman, 2015-12-02 15:55:21]

reveman@chromium.org changed reviewers:
+ denniskempin@chromium.org, piman@chromium.org

[piman, 2015-12-02 22:13:50]

lgtm

[reveman, 2015-12-02 22:28:42]

The CQ bit was checked by reveman@chromium.org

[commit-bot: I haz the power, 2015-12-02 22:32:17]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1491843002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1491843002/20001

[commit-bot: I haz the power, 2015-12-02 23:16:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-02 23:16:25]

Failed to apply patch for components/exo/shell_surface.cc:
While running git apply --index -3 -p1;
  error: patch failed: components/exo/shell_surface.cc:138
  Falling back to three-way merge...
  Applied patch to 'components/exo/shell_surface.cc' with conflicts.
  U components/exo/shell_surface.cc

Patch:       components/exo/shell_surface.cc
Index: components/exo/shell_surface.cc
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index
dfcc0923b47838a12075e3bf404caaad0f793718..26abdd920505574666d2533a15534820110eec02
100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -13,9 +13,12 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/surface.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/widget.h"
 
+DECLARE_WINDOW_PROPERTY_TYPE(std::string*)
+
 namespace exo {
 namespace {
 
@@ -64,6 +67,8 @@ views::Widget::InitParams CreateWidgetInitParams(

////////////////////////////////////////////////////////////////////////////////
 // ShellSurface, public:
 
+DEFINE_LOCAL_WINDOW_PROPERTY_KEY(std::string*, kApplicationIdKey, nullptr)
+
 ShellSurface::ShellSurface(Surface* surface) : surface_(surface) {
   surface_->SetSurfaceDelegate(this);
   surface_->AddSurfaceObserver(this);
@@ -93,6 +98,7 @@ void ShellSurface::SetToplevel() {
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  SetApplicationId(widget_->GetNativeWindow(), &application_id_);
 
   // The position of a standard top level shell surface is managed by Ash.
   ash::wm::GetWindowState(widget_->GetNativeWindow())
@@ -112,6 +118,7 @@ void ShellSurface::SetMaximized() {
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  SetApplicationId(widget_->GetNativeWindow(), &application_id_);
 }
 
 void ShellSurface::SetFullscreen() {
@@ -127,6 +134,7 @@ void ShellSurface::SetFullscreen() {
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  SetApplicationId(widget_->GetNativeWindow(), &application_id_);
 }
 
 void ShellSurface::SetTitle(const base::string16& title) {
@@ -138,11 +146,31 @@ void ShellSurface::SetTitle(const base::string16& title) {
     widget_->UpdateWindowTitle();
 }
 
+// static
+void ShellSurface::SetApplicationId(aura::Window* window,
+                                    std::string* application_id) {
+  window->SetProperty(kApplicationIdKey, application_id);
+}
+
+// static
+const std::string ShellSurface::GetApplicationId(aura::Window* window) {
+  std::string* string_ptr = window->GetProperty(kApplicationIdKey);
+  return string_ptr ? *string_ptr : std::string();
+}
+
+void ShellSurface::SetApplicationId(const std::string& application_id) {
+  TRACE_EVENT1("exo", "ShellSurface::SetApplicationId", "application_id",
+               application_id);
+
+  application_id_ = application_id;
+}
+
 scoped_refptr<base::trace_event::TracedValue> ShellSurface::AsTracedValue()
     const {
   scoped_refptr<base::trace_event::TracedValue> value =
       new base::trace_event::TracedValue;
   value->SetString("title", base::UTF16ToUTF8(title_));
+  value->SetString("application_id", application_id_);
   return value;
 }

[commit-bot: I haz the power, 2015-12-02 23:17:27]

The CQ bit was unchecked by commit-bot@chromium.org

[reveman, 2015-12-03 06:36:42]

The CQ bit was checked by reveman@chromium.org

[reveman, 2015-12-03 06:36:43]

The patchset sent to the CQ was uploaded after l-g-t-m from piman@chromium.org
Link to the patchset: https://codereview.chromium.org/1491843002/#ps40001
(title: "rebase")

[commit-bot: I haz the power, 2015-12-03 06:36:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1491843002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1491843002/40001

[commit-bot: I haz the power, 2015-12-03 06:58:00]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-03 06:58:01]

Failed to apply patch for components/exo/shell_surface.cc:
While running git apply --index -3 -p1;
  error: patch failed: components/exo/shell_surface.cc:93
  Falling back to three-way merge...
  Applied patch to 'components/exo/shell_surface.cc' with conflicts.
  U components/exo/shell_surface.cc

Patch:       components/exo/shell_surface.cc
Index: components/exo/shell_surface.cc
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index
dd6caba000c691fc0dc518366e4c58e35e326902..1bc82b4f7696f19c6cb484cd13a55978296c33cd
100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -13,9 +13,12 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/surface.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/widget.h"
 
+DECLARE_WINDOW_PROPERTY_TYPE(std::string*)
+
 namespace exo {
 namespace {
 
@@ -64,6 +67,8 @@ views::Widget::InitParams CreateWidgetInitParams(

////////////////////////////////////////////////////////////////////////////////
 // ShellSurface, public:
 
+DEFINE_LOCAL_WINDOW_PROPERTY_KEY(std::string*, kApplicationIdKey, nullptr)
+
 ShellSurface::ShellSurface(Surface* surface) : surface_(surface) {
   surface_->SetSurfaceDelegate(this);
   surface_->AddSurfaceObserver(this);
@@ -93,6 +98,7 @@ void ShellSurface::SetToplevel() {
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  SetApplicationId(widget_->GetNativeWindow(), &application_id_);
 
   // The position of a standard top level shell surface is managed by Ash.
   ash::wm::GetWindowState(widget_->GetNativeWindow())
@@ -112,6 +118,7 @@ void ShellSurface::SetMaximized() {
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  SetApplicationId(widget_->GetNativeWindow(), &application_id_);
 }
 
 void ShellSurface::SetFullscreen() {
@@ -127,6 +134,7 @@ void ShellSurface::SetFullscreen() {
   widget_.reset(new views::Widget);
   widget_->Init(params);
   widget_->GetNativeWindow()->set_owned_by_parent(false);
+  SetApplicationId(widget_->GetNativeWindow(), &application_id_);
 }
 
 void ShellSurface::SetTitle(const base::string16& title) {
@@ -138,6 +146,25 @@ void ShellSurface::SetTitle(const base::string16& title) {
     widget_->UpdateWindowTitle();
 }
 
+// static
+void ShellSurface::SetApplicationId(aura::Window* window,
+                                    std::string* application_id) {
+  window->SetProperty(kApplicationIdKey, application_id);
+}
+
+// static
+const std::string ShellSurface::GetApplicationId(aura::Window* window) {
+  std::string* string_ptr = window->GetProperty(kApplicationIdKey);
+  return string_ptr ? *string_ptr : std::string();
+}
+
+void ShellSurface::SetApplicationId(const std::string& application_id) {
+  TRACE_EVENT1("exo", "ShellSurface::SetApplicationId", "application_id",
+               application_id);
+
+  application_id_ = application_id;
+}
+
 void ShellSurface::Move() {
   TRACE_EVENT0("exo", "ShellSurface::Move");
 
@@ -152,6 +179,7 @@ scoped_refptr<base::trace_event::TracedValue>
ShellSurface::AsTracedValue()
   scoped_refptr<base::trace_event::TracedValue> value =
       new base::trace_event::TracedValue;
   value->SetString("title", base::UTF16ToUTF8(title_));
+  value->SetString("application_id", application_id_);
   return value;
 }

[commit-bot: I haz the power, 2015-12-03 06:58:53]

The CQ bit was unchecked by commit-bot@chromium.org

[reveman, 2015-12-03 07:03:17]

The CQ bit was checked by reveman@chromium.org

[reveman, 2015-12-03 07:03:17]

The patchset sent to the CQ was uploaded after l-g-t-m from piman@chromium.org
Link to the patchset: https://codereview.chromium.org/1491843002/#ps60001
(title: "rebase")

[commit-bot: I haz the power, 2015-12-03 07:04:39]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1491843002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1491843002/60001

[commit-bot: I haz the power, 2015-12-03 07:28:42]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-12-03 07:30:03]

Description was changed from

==========
exo: Add ShellSurface::SetApplicationId.

The application ID identifies the general class of applications to which
the surface belongs. Chromium can use this to group multiple surfaces
together, or to determine how to launch a new application.

BUG=549781
TEST=exo_unittest --gtest_filter=ShellSurfaceTest.SetApplicationId
==========

to

==========
exo: Add ShellSurface::SetApplicationId.

The application ID identifies the general class of applications to which
the surface belongs. Chromium can use this to group multiple surfaces
together, or to determine how to launch a new application.

BUG=549781
TEST=exo_unittest --gtest_filter=ShellSurfaceTest.SetApplicationId

Committed: https://crrev.com/936be6f74b610c83c41f426a8fad5270507c02f6
Cr-Commit-Position: refs/heads/master@{#362930}
==========

[commit-bot: I haz the power, 2015-12-03 07:30:04]

Patchset 4 (id:??) landed as
https://crrev.com/936be6f74b610c83c41f426a8fad5270507c02f6
Cr-Commit-Position: refs/heads/master@{#362930}