ash: Put ViewClickListener into its own header file.

BUG=174228
R=jamescook@chromium.org,jennyz@chromium.org
TBR=xiyuan@chromium.org # for trivial change in c/b/chromeos/system/

Review URL: https://chromiumcodereview.appspot.com/12381062

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185981 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 50 insertions, 24 deletions

diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index 61f834b..32ae9b6 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -297,7 +297,7 @@ class BluetoothDetailedView : public TrayDetailsView,
   }
 
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE {
+  virtual void OnViewClicked(views::View* sender) OVERRIDE {
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->system_tray_delegate();
     if (sender == footer()->content()) {
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.cc b/ash/system/chromeos/enterprise/tray_enterprise.cc
index 208bd83..368cec3 100644
--- a/ash/system/chromeos/enterprise/tray_enterprise.cc
+++ b/ash/system/chromeos/enterprise/tray_enterprise.cc
@@ -110,7 +110,7 @@ void TrayEnterprise::OnEnterpriseDomainChanged() {
   UpdateEnterpriseMessage();
 }
 
-void TrayEnterprise::ClickedOn(views::View* sender) {
+void TrayEnterprise::OnViewClicked(views::View* sender) {
   Shell::GetInstance()->system_tray_delegate()->ShowEnterpriseInfo();
 }
 
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.h b/ash/system/chromeos/enterprise/tray_enterprise.h
index d74744f..050c0f0 100644
--- a/ash/system/chromeos/enterprise/tray_enterprise.h
+++ b/ash/system/chromeos/enterprise/tray_enterprise.h
@@ -7,7 +7,7 @@
 
 #include "ash/system/chromeos/enterprise/enterprise_domain_observer.h"
 #include "ash/system/tray/system_tray_item.h"
-#include "ash/system/tray/tray_views.h"
+#include "ash/system/tray/view_click_listener.h"
 
 namespace ash {
 class SystemTray;
@@ -37,7 +37,7 @@ class TrayEnterprise : public SystemTrayItem,
   virtual void OnEnterpriseDomainChanged() OVERRIDE;
 
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE;
+  virtual void OnViewClicked(views::View* sender) OVERRIDE;
 
  private:
   EnterpriseDefaultView* default_view_;
diff --git a/ash/system/chromeos/network/network_list_detailed_view.cc b/ash/system/chromeos/network/network_list_detailed_view.cc
index 17ea3c0..61d7dac 100644
--- a/ash/system/chromeos/network/network_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_list_detailed_view.cc
@@ -8,6 +8,7 @@
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_views.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/chromeos/network/network_list_detailed_view_base.cc b/ash/system/chromeos/network/network_list_detailed_view_base.cc
index 00b792e..ecdcb4c 100644
--- a/ash/system/chromeos/network/network_list_detailed_view_base.cc
+++ b/ash/system/chromeos/network/network_list_detailed_view_base.cc
@@ -325,7 +325,7 @@ void NetworkListDetailedViewBase::ButtonPressed(views::Button* sender,
     CustomButtonPressed(sender, event);
 }
 
-void NetworkListDetailedViewBase::ClickedOn(views::View* sender) {
+void NetworkListDetailedViewBase::OnViewClicked(views::View* sender) {
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   // If the info bubble was visible, close it when some other item is clicked
   // on.
diff --git a/ash/system/chromeos/network/network_list_detailed_view_base.h b/ash/system/chromeos/network/network_list_detailed_view_base.h
index b205a6f..1d1c648 100644
--- a/ash/system/chromeos/network/network_list_detailed_view_base.h
+++ b/ash/system/chromeos/network/network_list_detailed_view_base.h
@@ -5,10 +5,10 @@
 #define ASH_SYSTEM_NETWORK_NETWORK_LIST_DETAILED_VIEW_BASE_H
 
 #include "ash/system/chromeos/network/network_detailed_view.h"
-#include "ash/system/tray/tray_views.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/view.h"
+#include "ui/views/controls/button/button.h"
 
 namespace views {
 class BubbleDelegateView;
@@ -21,6 +21,7 @@ struct NetworkIconInfo;
 namespace internal {
 
 class HoverHighlightView;
+class TrayPopupLabelButton;
 
 namespace tray {
 
@@ -61,7 +62,7 @@ class NetworkListDetailedViewBase : public NetworkDetailedView,
                              const ui::Event& event) OVERRIDE;
 
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE;
+  virtual void OnViewClicked(views::View* sender) OVERRIDE;
 
  private:
   typedef std::map<views::View*, std::string> NetworkMap;
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index a09bcf0..6fbbcbe4 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -241,7 +241,7 @@ void NetworkStateListDetailedView::ButtonPressed(views::Button* sender,
   }
 }
 
-void NetworkStateListDetailedView::ClickedOn(views::View* sender) {
+void NetworkStateListDetailedView::OnViewClicked(views::View* sender) {
   // If the info bubble was visible, close it when some other item is clicked.
   ResetInfoBubble();
 
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.h b/ash/system/chromeos/network/network_state_list_detailed_view.h
index 4c87723..f5a6946 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.h
@@ -12,7 +12,7 @@
 #include "ash/system/chromeos/network/network_detailed_view.h"
 #include "ash/system/chromeos/network/network_icon.h"
 #include "ash/system/chromeos/network/network_icon_animation_observer.h"
-#include "ash/system/tray/tray_views.h"
+#include "ash/system/tray/view_click_listener.h"
 #include "ash/system/user/login_status.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/controls/button/button.h"
@@ -30,6 +30,7 @@ namespace internal {
 
 class HoverHighlightView;
 class TrayNetwork;
+class TrayPopupLabelButton;
 
 namespace tray {
 
@@ -61,7 +62,7 @@ class NetworkStateListDetailedView : public NetworkDetailedView,
                              const ui::Event& event) OVERRIDE;
 
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE;
+  virtual void OnViewClicked(views::View* sender) OVERRIDE;
 
  private:
   typedef std::map<views::View*, std::string> NetworkMap;
diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/chromeos/network/tray_sms.cc
index 07a0a29..dd7efdc 100644
--- a/ash/system/chromeos/network/tray_sms.cc
+++ b/ash/system/chromeos/network/tray_sms.cc
@@ -229,7 +229,7 @@ class TraySms::SmsDetailedView : public TrayDetailsView,
   }
 
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE {
+  virtual void OnViewClicked(views::View* sender) OVERRIDE {
     if (sender == footer()->content())
       owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   }
diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc
index 2a2efac..9209aa6 100644
--- a/ash/system/drive/tray_drive.cc
+++ b/ash/system/drive/tray_drive.cc
@@ -360,7 +360,7 @@ class DriveDetailedView : public TrayDetailsView,
   }
 
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE {
+  virtual void OnViewClicked(views::View* sender) OVERRIDE {
     SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     if (sender == footer()->content()) {
       owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index c9a92bb..a0460b7 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -134,7 +134,7 @@ class IMEDetailedView : public TrayDetailsView,
   }
 
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE {
+  virtual void OnViewClicked(views::View* sender) OVERRIDE {
     SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
     if (sender == footer()->content()) {
       owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
diff --git a/ash/system/tray/hover_highlight_view.cc b/ash/system/tray/hover_highlight_view.cc
index c229245..e826ef6 100644
--- a/ash/system/tray/hover_highlight_view.cc
+++ b/ash/system/tray/hover_highlight_view.cc
@@ -7,6 +7,7 @@
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
+#include "ash/system/tray/view_click_listener.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -126,7 +127,7 @@ void HoverHighlightView::SetExpandable(bool expandable) {
 bool HoverHighlightView::PerformAction(const ui::Event& event) {
   if (!listener_)
     return false;
-  listener_->ClickedOn(this);
+  listener_->OnViewClicked(this);
   return true;
 }
 
diff --git a/ash/system/tray/tray_views.h b/ash/system/tray/tray_views.h
index ea2596f..393a65c 100644
--- a/ash/system/tray/tray_views.h
+++ b/ash/system/tray/tray_views.h
@@ -33,12 +33,6 @@ namespace internal {
 
 class TrayItemView;
 
-class ViewClickListener {
- public:
-  virtual ~ViewClickListener() {}
-  virtual void ClickedOn(views::View* sender) = 0;
-};
-
 // A custom scroll-view that has a specified dimension.
 class FixedSizedScrollView : public views::ScrollView {
  public:
diff --git a/ash/system/tray/view_click_listener.h b/ash/system/tray/view_click_listener.h
new file mode 100644
index 0000000..b5f4bb8
--- /dev/null
+++ b/ash/system/tray/view_click_listener.h
@@ -0,0 +1,26 @@
+// Copyright 2013 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_TRAY_VIEW_CLICK_LISTENER_H_
+#define ASH_SYSTEM_TRAY_VIEW_CLICK_LISTENER_H_
+
+namespace views {
+class View;
+}
+
+namespace ash {
+namespace internal {
+
+class ViewClickListener {
+ public:
+  virtual void OnViewClicked(views::View* sender) = 0;
+
+ protected:
+  virtual ~ViewClickListener() {}
+};
+
+}  // namespace internal
+}  // namespace ash
+
+#endif  // ASH_SYSTEM_TRAY_VIEW_CLICK_LISTENER_H_
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index 4e32652..5b79eb9 100644
--- a/ash/system/tray_accessibility.cc
+++ b/ash/system/tray_accessibility.cc
@@ -187,7 +187,7 @@ HoverHighlightView* AccessibilityDetailedView::AddScrollListItem(
   return container;
 }
 
-void AccessibilityDetailedView::ClickedOn(views::View* sender) {
+void AccessibilityDetailedView::OnViewClicked(views::View* sender) {
   ShellDelegate* shell_delegate = Shell::GetInstance()->delegate();
   if (sender == footer()->content()) {
     owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
diff --git a/ash/system/tray_accessibility.h b/ash/system/tray_accessibility.h
index a1a6f35..629cf51 100644
--- a/ash/system/tray_accessibility.h
+++ b/ash/system/tray_accessibility.h
@@ -9,8 +9,10 @@
 #include "ash/shell_observer.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_image_item.h"
-#include "ash/system/tray/tray_views.h"
+#include "ash/system/tray/view_click_listener.h"
 #include "base/gtest_prod_util.h"
+#include "ui/gfx/font.h"
+#include "ui/views/controls/button/button.h"
 
 namespace chromeos {
 class TrayAccessibilityTest;
@@ -63,7 +65,7 @@ class AccessibilityDetailedView : public TrayDetailsView,
                                         gfx::Font::FontStyle style,
                                         bool checked);
   // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE;
+  virtual void OnViewClicked(views::View* sender) OVERRIDE;
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;