ash/system/network/network_state_list_detailed_view.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" - Code Review

Chromium Code Reviews

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

(4178)

My Issues | Starred Open | Closed | All

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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

« no previous file with comments | « ash/system/network/network_state_list_detailed_view.h ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/network/network_state_list_detailed_view.cc

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

index 1869b14cd5d45f07019c2ecc356f620a8e3949b4..caf797c138c90e68373a4f1e005fbb79319aa7d6 100644

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

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

@@ -7,8 +7,10 @@

#include <algorithm>

#include <vector>

-#include "ash/ash_constants.h"

-#include "ash/material_design/material_design_controller.h"

+#include "ash/common/ash_constants.h"

+#include "ash/common/material_design/material_design_controller.h"

+#include "ash/common/wm_shell.h"

+#include "ash/common/wm_window.h"

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

#include "ash/resources/grit/ash_resources.h"

#include "ash/root_window_controller.h"

@@ -33,8 +35,6 @@

#include "ash/system/tray/tray_details_view.h"

#include "ash/system/tray/tray_popup_header_button.h"

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

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/command_line.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversions.h"

« no previous file with comments | « ash/system/network/network_state_list_detailed_view.h ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698