mash: Migrate remaining tray observers and notify functions.

chrome/browser/chromeos/net/network_portal_notification_controller.cc

 // Copyright 2014 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/chromeos/net/network_portal_notification_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/system/system_notifier.h"
-#include "ash/shell.h"
-#include "ash/system/tray/system_tray_notifier.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
+#include "ash/common/wm_shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 269 matching lines @@
   // Don't do anything if we're currently activating the device.
   if (MobileActivator::GetInstance()->RunningActivation())
     return;
 
   // Don't do anything if notification for |network| already was
   // displayed.
   if (network->path() == last_network_path_)
     return;
   last_network_path_ = network->path();
 
-  if (ash::Shell::HasInstance()) {
-    ash::Shell::GetInstance()
-        ->system_tray_notifier()
-        ->NotifyOnCaptivePortalDetected(network->path());
+  if (ash::WmShell::HasInstance()) {
+    ash::WmShell::Get()->system_tray_notifier()->NotifyOnCaptivePortalDetected(
+        network->path());
   }
 
   message_center::MessageCenter::Get()->AddNotification(
       GetNotification(network, state));
 }
 
 void NetworkPortalNotificationController::ShowDialog() {
   if (dialog_)
     return;
 
@@ skipping 124 matching lines @@
   if (dialog_)
     dialog_->Close();
 }
 
 const NetworkPortalWebDialog*
 NetworkPortalNotificationController::GetDialogForTesting() const {
   return dialog_;
 }
 
 }  // namespace chromeos