mash: Move user_switch_util to chrome.

chrome/browser/ui/ash/multi_user/user_switch_util.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 "ash/system/chromeos/multi_user/user_switch_util.h"
+#include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
 
 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
 #include "ash/shell.h"
+#include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/system_tray.h"
-#include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
-namespace ash {
-
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 500;
 const int kDefaultHeight = 150;
 
 const int kPaddingToMessage = 30;
 const int kInset = 40;
 const int kTopInset = 10;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Dialog for multi-profiles desktop casting warning.
 class DesktopCastingWarningView : public views::DialogDelegateView {
  public:
-  DesktopCastingWarningView(base::Callback<void()> on_accept);
+  explicit DesktopCastingWarningView(base::Callback<void()> on_accept);

[James Cook, 2016/07/13 19:26:06]

Thanks for fixing. (Out of curiosity, do you use "git cl lint"? I didn't used
to, but I turned it on recently in Sublime. It's sometimes useful, sometimes
annoying.)

[msw, 2016/07/13 19:31:52]

Nope; just saw this lint error in presubmit.

   ~DesktopCastingWarningView() override;
 
   static void ShowDialog(const base::Callback<void()> on_accept);
 
   // views::DialogDelegate overrides.
   bool Accept() override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
   bool IsDialogButtonEnabled(ui::DialogButton button) const override;
   int GetDefaultDialogButton() const override;
 
@@ skipping 38 matching lines @@
   views::DialogDelegate::CreateDialogWidget(
       dialog_view, ash::Shell::GetTargetRootWindow(), NULL);
   dialog_view->InitDialog();
   views::Widget* widget = dialog_view->GetWidget();
   DCHECK(widget);
   widget->Show();
 }
 
 bool DesktopCastingWarningView::Accept() {
   // Stop screen sharing and capturing.
-  SystemTray* system_tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
+  ash::SystemTray* system_tray =
+      ash::Shell::GetInstance()->GetPrimarySystemTray();
   if (system_tray->GetScreenShareItem()->is_started())
     system_tray->GetScreenShareItem()->Stop();
   if (system_tray->GetScreenCaptureItem()->is_started())
     system_tray->GetScreenCaptureItem()->Stop();
 
   on_switch_.Run();
   return true;
 }
 
 base::string16 DesktopCastingWarningView::GetDialogButtonLabel(
@@ skipping 64 matching lines @@
 // Factory function.
 
 void TrySwitchingActiveUser(const base::Callback<void()> on_switch) {
   // Some unit tests do not have a shell. In that case simply execute.
   if (!ash::Shell::HasInstance()) {
     on_switch.Run();
     return;
   }
   // If neither screen sharing nor capturing is going on we can immediately
   // switch users.
-  SystemTray* system_tray = ash::Shell::GetInstance()->GetPrimarySystemTray();
+  ash::SystemTray* system_tray =
+      ash::Shell::GetInstance()->GetPrimarySystemTray();
   if (!system_tray->GetScreenShareItem()->is_started() &&
       !system_tray->GetScreenCaptureItem()->is_started()) {
     on_switch.Run();
     return;
   }
   DesktopCastingWarningView::ShowDialog(on_switch);
 }
 
 bool TestAndTerminateDesktopCastingWarningForTest(bool accept) {
   if (!instance_for_test)
     return false;
   if (accept)
     instance_for_test->Accept();
   delete instance_for_test->GetWidget()->GetNativeWindow();
   CHECK(!instance_for_test);
   return true;
 }
-
-}  // namespace chromeos