ash/common/system/chromeos/network/network_state_list_detailed_view.cc - Issue 2395523002: chromeos: Refactor system tray "show settings" commands to use mojo

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/system/chromeos/network/network_state_list_detailed_view.cc

Issue 2395523002: chromeos: Refactor system tray "show settings" commands to use mojo (Closed)

Patch Set: Created 4 years, 2 months 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

« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | chrome/browser/ui/ash/system_tray_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/network/network_state_list_detailed_view.cc

diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc

index d9d9d89e645e7aa7325cb0fec516561985d95149..ef7294ea66d60eafbc2e490a2255d339a07ce3c7 100644

--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc

+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc

@@ -17,6 +17,7 @@

#include "ash/common/system/tray/fixed_sized_scroll_view.h"

#include "ash/common/system/tray/hover_highlight_view.h"

#include "ash/common/system/tray/system_tray.h"

+#include "ash/common/system/tray/system_tray_controller.h"

#include "ash/common/system/tray/system_tray_delegate.h"

#include "ash/common/system/tray/throbber_view.h"

#include "ash/common/system/tray/tray_constants.h"

@@ -398,7 +399,7 @@ void NetworkStateListDetailedView::HandleButtonPressed(views::Button* sender,

ShowSettings();

close_bubble = true;

} else if (sender == proxy_settings_) {

- delegate->ShowProxySettings();

+ WmShell::Get()->system_tray_controller()->ShowProxySettings();

close_bubble = true;

} else if (sender == other_mobile_) {

delegate->ShowOtherNetworkDialog(shill::kTypeCellular);