mash: Replace int ShelfIDs with AppLaunchID strings.

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

 // Copyright 2016 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 "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/frame/custom_frame_view_ash.h"
@@ skipping 113 matching lines @@
 
 ChromeNativeAppWindowViewsAuraAsh::ChromeNativeAppWindowViewsAuraAsh() {}
 
 ChromeNativeAppWindowViewsAuraAsh::~ChromeNativeAppWindowViewsAuraAsh() {}
 
 void ChromeNativeAppWindowViewsAuraAsh::InitializeWindow(
     AppWindow* app_window,
     const AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViewsAura::InitializeWindow(app_window, create_params);
   aura::Window* window = widget()->GetNativeWindow();
-  window->SetProperty(aura::client::kAppIdKey,
-                      new std::string(app_window->extension_id()));
 
   if (app_window->window_type_is_panel()) {
     // Ash's ShelfWindowWatcher handles app panel windows once this type is set.
     // The type should have been initialized for mash below, via mus_properties.
     if (!ash_util::IsRunningInMash())
       window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP_PANEL);
   } else {
     window->SetProperty(aura::client::kAppType,
                         static_cast<int>(ash::AppType::CHROME_APP));
   }
@@ skipping 227 matching lines @@
     window_tree_host->SetClientArea(insets,
                                     std::move(additional_client_regions));
   }
 }
 
 void ChromeNativeAppWindowViewsAuraAsh::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
 }