chrome/browser/ui/ash/system_tray_tray_cast_browsertest_chromeos.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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/system_tray_tray_cast_browsertest_chromeos.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "ash/common/system/cast/tray_cast.h"	5 #include "ash/common/system/cast/tray_cast.h"

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

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

7 #include "ash/common/system/tray/system_tray_item.h"	8 #include "ash/common/system/tray/system_tray_item.h"

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

9 #include "ash/shell.h"	10 #include "ash/shell.h"

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

11 #include "ash/test/tray_cast_test_api.h"	11 #include "ash/test/tray_cast_test_api.h"

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

13 #include "base/memory/ptr_util.h"	13 #include "base/memory/ptr_util.h"

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

15 #include "chrome/browser/profiles/profile_manager.h"	15 #include "chrome/browser/profiles/profile_manager.h"

16 #include "chrome/browser/ui/tabs/tab_strip_model.h"	16 #include "chrome/browser/ui/tabs/tab_strip_model.h"

17 #include "content/public/browser/render_view_host.h"	17 #include "content/public/browser/render_view_host.h"

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

19 #include "extensions/browser/process_manager.h"	19 #include "extensions/browser/process_manager.h"

20 #include "extensions/common/feature_switch.h"	20 #include "extensions/common/feature_switch.h"

(...skipping 267 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
288 cast_config_delegate->LaunchCastOptions();	288 cast_config_delegate->LaunchCastOptions();

289	289

290 const GURL url =	290 const GURL url =

291 browser()->tab_strip_model()->GetActiveWebContents()->GetURL();	291 browser()->tab_strip_model()->GetActiveWebContents()->GetURL();

292 EXPECT_TRUE(base::StringPiece(url.GetContent()).ends_with("options.html"));	292 EXPECT_TRUE(base::StringPiece(url.GetContent()).ends_with("options.html"));

293	293

294 UninstallExtension(extension->id());	294 UninstallExtension(extension->id());

295 }	295 }

296	296

297 } // namespace chromeos	297 } // namespace chromeos

OLD	NEW