Refactor ShellWindow to separate platform-specific code.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

 // Copyright (c) 2012 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/ash/launcher/chrome_launcher_controller.h"
 
 #include <set>
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
@@ skipping 635 matching lines @@
       else
         NOTREACHED() << "Unexpected pref change for " << pref_name;
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type=" << type;
   }
 }
 
 void ChromeLauncherController::OnShellWindowAdded(ShellWindow* shell_window) {
-  aura::Window* window = shell_window->GetNativeWindow();
+  aura::Window* window = shell_window->GetBaseWindow()->GetNativeWindow();
   ash::LauncherItemStatus status = ash::wm::IsActiveWindow(window) ?
       ash::STATUS_ACTIVE : ash::STATUS_RUNNING;
   window->AddObserver(this);
   const std::string app_id = shell_window->extension()->id();
   ash::LauncherID id = 0;
   for (IDToItemMap::const_iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
     if (i->second.app_id == app_id) {
       id = i->first;
       SetItemStatus(id, status);
@@ skipping 39 matching lines @@
 
   DCHECK(id_to_item_map_.find(id) != id_to_item_map_.end());
   platform_app_windows_.remove(window);
   extensions::ShellWindowRegistry::ShellWindowSet remaining_windows =
       extensions::ShellWindowRegistry::Get(profile_)->GetShellWindowsForApp(
           id_to_item_map_[id].app_id);
 
   // We can't count on getting called before or after the ShellWindowRegistry.
   if (remaining_windows.size() > 1 ||
       (remaining_windows.size() == 1 &&
-          (*remaining_windows.begin())->GetNativeWindow() != window)) {
+          (*remaining_windows.begin())->GetBaseWindow()->GetNativeWindow() !=
+              window)) {
     return;
   }
 
   // Close or remove item.
   int index = model_->ItemIndexByID(id);
   DCHECK_GE(index, 0);
   ash::LauncherItem item = model_->items()[index];
   if (item.type == ash::TYPE_APP_SHORTCUT)
     SetItemStatus(id, ash::STATUS_CLOSED);
   else
@@ skipping 262 matching lines @@
   }
   model_->AddAt(index, item);
 
   if (!controller || controller->type() !=
       BrowserLauncherItemController::TYPE_EXTENSION_PANEL) {
     if (item.status != ash::STATUS_IS_PENDING)
       app_icon_loader_->FetchImage(app_id);
   }
   return id;
 }