Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3099)

Unified Diff: ash/system/chromeos/network/network_list_detailed_view_base.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unnecessary forward declarations. Renamed |tray| to |owner|. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/network/network_list_detailed_view_base.cc
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 2b7dca1417219d589568c03e9c06cdede0d9c542..c5e541f855dd2eb414c34b7b03e09c0917494650 100644
--- a/ash/system/chromeos/network/network_list_detailed_view_base.cc
+++ b/ash/system/chromeos/network/network_list_detailed_view_base.cc
@@ -8,6 +8,7 @@
#include "ash/shell_window_ids.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/tray_constants.h"
#include "base/utf_string_conversions.h"
#include "grit/ash_resources.h"
@@ -80,9 +81,11 @@ enum ColorTheme {
};
NetworkListDetailedViewBase::NetworkListDetailedViewBase(
+ SystemTrayItem* owner,
user::LoginStatus login,
int header_string_id)
- : login_(login),
+ : NetworkDetailedView(owner),
+ login_(login),
header_string_id_(header_string_id),
info_icon_(NULL),
settings_(NULL),
@@ -292,7 +295,7 @@ void NetworkListDetailedViewBase::ClickedOn(views::View* sender) {
ResetInfoBubble();
if (sender == footer()->content()) {
- Shell::GetInstance()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+ owner()->system_tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
return;
}

Powered by Google App Engine
This is Rietveld 408576698