ash/common/system/chromeos/network/network_state_list_detailed_view.cc - Issue 2620153003: Folds WmRootWindowController into RootWindowController

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 2620153003: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: merge Created 3 years, 11 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') | ash/common/wm_root_window_controller.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 05ce6f1bf2bdc7f52c21a7bd37ca330a0d941556..b87f56b16a343533cbe98c462dfb2984d34f8ab6 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

@@ -32,10 +32,10 @@

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

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

#include "ash/common/wm_lookup.h"

-#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/public/cpp/shell_window_ids.h"

+#include "ash/root_window_controller.h"

#include "base/command_line.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversions.h"