chrome/browser/ui/ash/networking_config_delegate_chromeos_browsertest.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/ash/networking_config_delegate_chromeos_browsertest.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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/ash/networking_config_delegate_chromeos.h ('k') | chrome/browser/ui/ash/palette_delegate_chromeos.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"	5 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"

6	6

7 #include "ash/common/login_status.h"	7 #include "ash/common/login_status.h"

8 #include "ash/common/system/chromeos/network/network_detailed_view.h"

9 #include "ash/common/system/chromeos/network/tray_network.h"

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

11 #include "ash/common/wm_shell.h"	8 #include "ash/common/wm_shell.h"

12 #include "ash/root_window_controller.h"	9 #include "ash/root_window_controller.h"

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

	11 #include "ash/system/network/network_detailed_view.h"

	12 #include "ash/system/network/tray_network.h"

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

14 #include "base/macros.h"	14 #include "base/macros.h"

15 #include "base/strings/string16.h"	15 #include "base/strings/string16.h"

16 #include "base/strings/utf_string_conversions.h"	16 #include "base/strings/utf_string_conversions.h"

17 #include "chrome/browser/extensions/extension_browsertest.h"	17 #include "chrome/browser/extensions/extension_browsertest.h"

18 #include "content/public/test/test_utils.h"	18 #include "content/public/test/test_utils.h"

19 #include "extensions/test/extension_test_message_listener.h"	19 #include "extensions/test/extension_test_message_listener.h"

20 #include "ui/base/l10n/l10n_util.h"	20 #include "ui/base/l10n/l10n_util.h"

21 #include "ui/views/view.h"	21 #include "ui/views/view.h"

22	22

23 namespace {	23 namespace {

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 IDS_ASH_STATUS_TRAY_EXTENSION_CONTROLLED_WIFI,	70 IDS_ASH_STATUS_TRAY_EXTENSION_CONTROLLED_WIFI,

71 base::UTF8ToUTF16("NetworkingConfigDelegate test extension"));	71 base::UTF8ToUTF16("NetworkingConfigDelegate test extension"));

72 EXPECT_TRUE(HasChildWithTooltip(tray_network->detailed(), expected_tooltip));	72 EXPECT_TRUE(HasChildWithTooltip(tray_network->detailed(), expected_tooltip));

73	73

74 // Close the system tray menu.	74 // Close the system tray menu.

75 system_tray->CloseSystemBubble();	75 system_tray->CloseSystemBubble();

76 content::RunAllPendingInMessageLoop();	76 content::RunAllPendingInMessageLoop();

77 }	77 }

78	78

79 } // namespace	79 } // namespace

OLD	NEW