Deprecate kAshDisableNewNetworkStatusArea

ash/system/chromeos/network/network_list_detailed_view_base.h

Index: ash/system/chromeos/network/network_list_detailed_view_base.h
diff --git a/ash/system/chromeos/network/network_list_detailed_view_base.h b/ash/system/chromeos/network/network_list_detailed_view_base.h
deleted file mode 100644
index cfea04359f47d9c53a6d02bf9e9f93163d0213b2..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/network/network_list_detailed_view_base.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// 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.
-#ifndef ASH_SYSTEM_NETWORK_NETWORK_LIST_DETAILED_VIEW_BASE_H
-#define ASH_SYSTEM_NETWORK_NETWORK_LIST_DETAILED_VIEW_BASE_H
-
-#include "ash/system/chromeos/network/network_detailed_view.h"
-#include "ash/system/tray/view_click_listener.h"
-#include "ash/system/user/login_status.h"
-#include "base/memory/scoped_ptr.h"
-#include "ui/views/controls/button/button.h"
-
-namespace views {
-class BubbleDelegateView;
-}
-
-namespace ash {
-
-struct NetworkIconInfo;
-
-namespace internal {
-
-class HoverHighlightView;
-class TrayPopupLabelButton;
-
-namespace tray {
-
-// Base class for the NetworkListDetailedView and VpnListDetailedView.
-class NetworkListDetailedViewBase : public NetworkDetailedView,
-                                    public views::ButtonListener,
-                                    public ViewClickListener {
- public:
-  NetworkListDetailedViewBase(SystemTrayItem* owner,
-                              user::LoginStatus login,
-                              int header_string_id);
-  virtual ~NetworkListDetailedViewBase();
-
-  // Overridden from NetworkDetailedView.
-  virtual void Init() OVERRIDE;
-  virtual NetworkDetailedView::DetailedViewType GetViewType() const OVERRIDE;
-  virtual void ManagerChanged() OVERRIDE;
-  virtual void NetworkListChanged() OVERRIDE;
-  virtual void NetworkServiceChanged(
-      const chromeos::NetworkState* network) OVERRIDE;
-
- protected:
-  void AppendInfoButtonToHeader();
-  void UpdateSettingButton();
-  void RefreshNetworkScrollWithUpdatedNetworkData();
-  user::LoginStatus login() const { return login_; }
-  bool IsNetworkListEmpty() const;
-  bool CreateOrUpdateInfoLabel(
-      int index, const base::string16& text, views::Label** label);
-  bool UpdateNetworkChild(int index, const NetworkIconInfo* info);
-
-  const std::vector<NetworkIconInfo>& network_list() const {
-    return network_list_;
-  }
-
-  // Overridden from ButtonListener.
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
-
-  // Overridden from ViewClickListener.
-  virtual void OnViewClicked(views::View* sender) OVERRIDE;
-
- private:
-  typedef std::map<views::View*, std::string> NetworkMap;
-  typedef std::map<std::string, HoverHighlightView*> ServicePathMap;
-
-  virtual void AppendHeaderButtons() = 0;
-  virtual void UpdateHeaderButtons() = 0;
-  virtual void AppendNetworkEntries() = 0;
-  virtual void GetAvailableNetworkList(std::vector<NetworkIconInfo>* list) = 0;
-  virtual void UpdateNetworkEntries() = 0;
-  virtual void AppendCustomButtonsToBottomRow(views::View* bottom_row) = 0;
-  virtual void UpdateNetworkExtra() = 0;
-  virtual void CustomButtonPressed(views::Button* sender,
-      const ui::Event& event) = 0;
-  // Returns true if custom link is clicked on.
-  virtual bool CustomLinkClickedOn(views::View* sender) = 0;
-  // Returns true if the scroll list needs to be relayed out.
-  virtual bool UpdateNetworkListEntries(
-      std::set<std::string>* new_service_paths) = 0;
-
-  void Update();
-  void CreateItems();
-  void AppendHeaderEntry(int header_string_id);
-  void AppendNetworkExtra();
-  void UpdateAvailableNetworkList();
-  bool OrderChild(views::View* view, int index);
-  void RefreshNetworkList();
-  // Adds a settings entry when logged in, and an entry for changing proxy
-  // settings otherwise.
-  void CreateSettingsEntry();
-  views::View* CreateNetworkInfoView();
-  void ToggleInfoBubble();
-  // Returns whether an existing info-bubble was closed.
-  bool ResetInfoBubble();
-
-  user::LoginStatus login_;
-  std::vector<NetworkIconInfo> network_list_;
-  int header_string_id_;
-  NetworkMap network_map_;
-  ServicePathMap service_path_map_;
-  TrayPopupHeaderButton* info_icon_;
-  TrayPopupLabelButton* settings_;
-  TrayPopupLabelButton* proxy_settings_;
-  views::BubbleDelegateView* info_bubble_;
-
-  DISALLOW_COPY_AND_ASSIGN(NetworkListDetailedViewBase);
-};
-
-}  // namespace tray
-}  // namespace internal
-}  // namespace ash
-
-#endif  // #ifndef ASH_SYSTEM_NETWORK_NETWORK_LIST_DETAILED_VIEW_BASE_H