mash: Convert system tray network item to wm common types

* Convert NetworkStateListDetailedView to wm common types and add debug name.
* Fix include guards.
* Move files to //ash/common/system/chromeos.
* Fix DEPS.

BUG=619636
TEST=ash_unittests, manual by opening the network (i) info panel and dumping
the window tree with Ctrl-Alt-Shift-W
TBR=derat@chromium.org

Review-Url: https://codereview.chromium.org/2109293002
Cr-Commit-Position: refs/heads/master@{#403301}

ash/ash.gyp

@@ -116,8 +116,23 @@
       'common/system/chromeos/devicetype_utils.h',
       'common/system/chromeos/enterprise/enterprise_domain_observer.h',
       'common/system/chromeos/media_security/media_capture_observer.h',
+      'common/system/chromeos/network/network_detailed_view.h',
       'common/system/chromeos/network/network_observer.h',
       'common/system/chromeos/network/network_portal_detector_observer.h',
+      'common/system/chromeos/network/network_state_list_detailed_view.cc',
+      'common/system/chromeos/network/network_state_list_detailed_view.h',
+      'common/system/chromeos/network/tray_network.cc',
+      'common/system/chromeos/network/tray_network.h',
+      'common/system/chromeos/network/tray_network_state_observer.cc',
+      'common/system/chromeos/network/tray_network_state_observer.h',
+      'common/system/chromeos/network/tray_sms.cc',
+      'common/system/chromeos/network/tray_sms.h',
+      'common/system/chromeos/network/tray_vpn.cc',
+      'common/system/chromeos/network/tray_vpn.h',
+      'common/system/chromeos/network/vpn_delegate.cc',
+      'common/system/chromeos/network/vpn_delegate.h',
+      'common/system/chromeos/network/vpn_list_view.cc',
+      'common/system/chromeos/network/vpn_list_view.h',
       'common/system/chromeos/power/battery_notification.cc',
       'common/system/chromeos/power/battery_notification.h',
       'common/system/chromeos/power/dual_role_notification.cc',
@@ -594,21 +609,6 @@
       'system/chromeos/media_security/multi_profile_media_tray_item.h',
       'system/chromeos/multi_user/user_switch_util.cc',
       'system/chromeos/multi_user/user_switch_util.h',
-      'system/chromeos/network/network_detailed_view.h',
-      'system/chromeos/network/network_state_list_detailed_view.cc',
-      'system/chromeos/network/network_state_list_detailed_view.h',
-      'system/chromeos/network/tray_network.cc',
-      'system/chromeos/network/tray_network.h',
-      'system/chromeos/network/tray_network_state_observer.cc',
-      'system/chromeos/network/tray_network_state_observer.h',
-      'system/chromeos/network/tray_sms.cc',
-      'system/chromeos/network/tray_sms.h',
-      'system/chromeos/network/tray_vpn.cc',
-      'system/chromeos/network/tray_vpn.h',
-      'system/chromeos/network/vpn_delegate.cc',
-      'system/chromeos/network/vpn_delegate.h',
-      'system/chromeos/network/vpn_list_view.cc',
-      'system/chromeos/network/vpn_list_view.h',
       'system/chromeos/power/power_event_observer.cc',
       'system/chromeos/power/power_event_observer.h',
       'system/chromeos/power/video_activity_notifier.cc',

ash/common/system/chromeos/DEPS

 include_rules = [
   "+chromeos",
+  "+grit/ui_chromeos_strings.h",
 ]

ash/system/chromeos/network/network_detailed_view.h → ash/common/system/chromeos/network/network_detailed_view.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_DETAILED_VIEW_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_DETAILED_VIEW_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_DETAILED_VIEW_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_DETAILED_VIEW_H_
 
 #include "ash/common/system/tray/tray_details_view.h"
 #include "chromeos/network/network_state_handler.h"
@@ -40,4 +40,4 @@ class NetworkDetailedView : public TrayDetailsView {
 }  // namespace tray
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_DETAILED_VIEW_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_DETAILED_VIEW_H_

ash/system/chromeos/network/network_state_list_detailed_view.cc → ash/common/system/chromeos/network/network_state_list_detailed_view.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/network_state_list_detailed_view.h"
+#include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
 
 #include <algorithm>
 #include <vector>
@@ -10,6 +10,8 @@
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/system/chromeos/network/tray_network_state_observer.h"
+#include "ash/common/system/chromeos/network/vpn_list_view.h"
 #include "ash/common/system/networking_config_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
@@ -20,12 +22,10 @@
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
-#include "ash/root_window_controller.h"
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
-#include "ash/system/chromeos/network/tray_network_state_observer.h"
-#include "ash/system/chromeos/network/vpn_list_view.h"
+#include "ash/common/wm_window.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ -43,7 +43,6 @@
 #include "grit/ui_chromeos_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/accessibility/ax_view_state.h"
-#include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/chromeos/network/network_connect.h"
@@ -131,9 +130,6 @@ class NetworkStateListDetailedView::InfoBubble
       : views::BubbleDialogDelegateView(anchor, views::BubbleBorder::TOP_RIGHT),
         detailed_view_(detailed_view) {
     set_can_activate(false);
-    set_parent_window(Shell::GetContainer(
-        anchor->GetWidget()->GetNativeWindow()->GetRootWindow(),
-        kShellWindowId_SettingBubbleContainer));
     SetLayoutManager(new views::FillLayout());
     AddChildView(content);
   }
@@ -144,6 +140,18 @@ class NetworkStateListDetailedView::InfoBubble
   // BubbleDialogDelegateView:
   int GetDialogButtons() const override { return ui::DIALOG_BUTTON_NONE; }
 
+  void OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
+                                views::Widget* widget) const override {
+    DCHECK(anchor_widget());
+    // Place the bubble in the anchor widget's root window.
+    WmLookup::Get()
+        ->GetWindowForWidget(anchor_widget())
+        ->GetRootWindowController()
+        ->ConfigureWidgetInitParamsForContainer(
+            widget, kShellWindowId_SettingBubbleContainer, params);
+    params->name = "NetworkStateListDetailedView::InfoBubble";
+  }
+
   // Not owned.
   NetworkStateListDetailedView* detailed_view_;
 

ash/system/chromeos/network/network_state_list_detailed_view.h → ash/common/system/chromeos/network/network_state_list_detailed_view.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
-#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
 
 #include <memory>
 #include <string>
 
 #include "ash/common/login_status.h"
+#include "ash/common/system/chromeos/network/network_detailed_view.h"
 #include "ash/common/system/tray/view_click_listener.h"
-#include "ash/system/chromeos/network/network_detailed_view.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/chromeos/network/network_list_delegate.h"
@@ -153,4 +153,4 @@ class NetworkStateListDetailedView
 }  // namespace tray
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_

ash/system/chromeos/network/tray_network.cc → ash/common/system/chromeos/network/tray_network.cc

@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/tray_network.h"
+#include "ash/common/system/chromeos/network/tray_network.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/wm_shelf_util.h"
+#include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
+#include "ash/common/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ -13,8 +15,6 @@
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_shell.h"
-#include "ash/system/chromeos/network/network_state_list_detailed_view.h"
-#include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"

ash/system/chromeos/network/tray_network.h → ash/common/system/chromeos/network/tray_network.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_
 
 #include <memory>
 #include <set>
 
 #include "ash/common/system/chromeos/network/network_observer.h"
 #include "ash/common/system/chromeos/network/network_portal_detector_observer.h"
+#include "ash/common/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/common/system/tray/system_tray_item.h"
-#include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 
@@ -67,4 +67,4 @@ class TrayNetwork : public SystemTrayItem,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_

ash/system/chromeos/network/tray_network_state_observer.cc → ash/common/system/chromeos/network/tray_network_state_observer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/tray_network_state_observer.h"
+#include "ash/common/system/chromeos/network/tray_network_state_observer.h"
 
 #include <set>
 #include <string>

ash/system/chromeos/network/tray_network_state_observer.h → ash/common/system/chromeos/network/tray_network_state_observer.h

@@ -2,12 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H_
 
-#include <string>
-
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "chromeos/network/network_state_handler_observer.h"
@@ -61,4 +58,4 @@ class TrayNetworkStateObserver : public chromeos::NetworkStateHandlerObserver {
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H_

ash/system/chromeos/network/tray_sms.cc → ash/common/system/chromeos/network/tray_sms.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/tray_sms.h"
+#include "ash/common/system/chromeos/network/tray_sms.h"
 
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
@@ -12,7 +12,6 @@
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_notification_view.h"
 #include "ash/common/system/tray/view_click_listener.h"
-#include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"

ash/system/chromeos/network/tray_sms.h → ash/common/system/chromeos/network/tray_sms.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H_
 
 #include <stddef.h>
 
@@ -63,4 +63,4 @@ class TraySms : public SystemTrayItem,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H_

ash/system/chromeos/network/tray_vpn.cc → ash/common/system/chromeos/network/tray_vpn.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/tray_vpn.h"
+#include "ash/common/system/chromeos/network/tray_vpn.h"
 
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
+#include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/wm_shell.h"
-#include "ash/system/chromeos/network/network_state_list_detailed_view.h"
-#include "ash/system/chromeos/network/vpn_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"

ash/system/chromeos/network/tray_vpn.h → ash/common/system/chromeos/network/tray_vpn.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H_
 
 #include <memory>
 
+#include "ash/common/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/common/system/tray/system_tray_item.h"
-#include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "base/macros.h"
 
 namespace ash {
@@ -49,4 +49,4 @@ class TrayVPN : public SystemTrayItem,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H_

ash/system/chromeos/network/vpn_delegate.cc → ash/common/system/chromeos/network/vpn_delegate.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/vpn_delegate.h"
+#include "ash/common/system/chromeos/network/vpn_delegate.h"
 
 #include "chromeos/network/network_state.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"

ash/system/chromeos/network/vpn_delegate.h → ash/common/system/chromeos/network/vpn_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H
-#define ASH_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H_
 
 #include <string>
 #include <vector>
@@ -98,4 +98,4 @@ class ASH_EXPORT VPNDelegate {
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H_

ash/system/chromeos/network/vpn_list_view.cc → ash/common/system/chromeos/network/vpn_list_view.cc

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/chromeos/network/vpn_list_view.h"
+#include "ash/common/system/chromeos/network/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
+#include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/wm_shell.h"
-#include "ash/system/chromeos/network/vpn_delegate.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"

ash/system/chromeos/network/vpn_list_view.h → ash/common/system/chromeos/network/vpn_list_view.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_VPN_LIST_VIEW_H_
-#define ASH_SYSTEM_CHROMEOS_NETWORK_VPN_LIST_VIEW_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_LIST_VIEW_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_LIST_VIEW_H_
 
 #include <map>
 #include <string>
 
+#include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/view_click_listener.h"
-#include "ash/system/chromeos/network/vpn_delegate.h"
 #include "base/macros.h"
 #include "chromeos/network/network_state_handler.h"
 #include "ui/chromeos/network/network_list_view_base.h"
@@ -92,4 +92,4 @@ class VPNListView : public ui::NetworkListViewBase,
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_VPN_LIST_VIEW_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_LIST_VIEW_H_

ash/system/tray/system_tray.cc

@@ -44,6 +44,9 @@
 #include "ui/views/view.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/network/tray_network.h"
+#include "ash/common/system/chromeos/network/tray_sms.h"
+#include "ash/common/system/chromeos/network/tray_vpn.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/tray_power.h"
 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
@@ -57,9 +60,6 @@
 #include "ash/system/chromeos/brightness/tray_brightness.h"
 #include "ash/system/chromeos/enterprise/tray_enterprise.h"
 #include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"
-#include "ash/system/chromeos/network/tray_network.h"
-#include "ash/system/chromeos/network/tray_sms.h"
-#include "ash/system/chromeos/network/tray_vpn.h"
 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
 #include "ash/system/chromeos/supervised/tray_supervised_user.h"
 #include "ash/system/chromeos/tray_caps_lock.h"

chrome/browser/ui/ash/vpn_delegate_chromeos.h

@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ash/system/chromeos/network/vpn_delegate.h"
+#include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/notification_observer.h"