ash/system/network/vpn_list_view.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

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/system/network/vpn_list_view.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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

Download patch

Index: ash/system/network/vpn_list_view.cc

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

similarity index 95%

rename from ash/common/system/chromeos/network/vpn_list_view.cc

rename to ash/system/network/vpn_list_view.cc

index c1c1c6e7fa384fcddbd46a1a0069458646c42ea7..7e52300435aa00eb104eb4e2eadc0dcab1eea4f2 100644

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

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

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/common/system/chromeos/network/vpn_list_view.h"

+#include "ash/system/network/vpn_list_view.h"

#include <memory>

#include <utility>

@@ -10,21 +10,21 @@

#include "ash/common/ash_view_ids.h"

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

-#include "ash/common/system/chromeos/network/network_icon.h"

-#include "ash/common/system/chromeos/network/network_icon_animation.h"

-#include "ash/common/system/chromeos/network/network_icon_animation_observer.h"

-#include "ash/common/system/chromeos/network/network_list_delegate.h"

-#include "ash/common/system/chromeos/network/vpn_list.h"

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

-#include "ash/common/system/tray/system_menu_button.h"

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

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

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

-#include "ash/common/system/tray/tray_popup_utils.h"

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

#include "ash/common/wm_shell.h"

#include "ash/resources/vector_icons/vector_icons.h"

#include "ash/strings/grit/ash_strings.h"

+#include "ash/system/network/network_icon.h"

+#include "ash/system/network/network_icon_animation.h"

+#include "ash/system/network/network_icon_animation_observer.h"

+#include "ash/system/network/network_list_delegate.h"

+#include "ash/system/network/vpn_list.h"

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

+#include "ash/system/tray/system_menu_button.h"

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

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

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

+#include "ash/system/tray/tray_popup_utils.h"

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

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/logging.h"

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