chrome/browser/app_controller_mac_browsertest.mm - Issue 23003004: Move apps tests from c/b/extensions to c/b/apps and refine DEPS.

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/app_controller_mac_browsertest.mm

Issue 23003004: Move apps tests from c/b/extensions to c/b/apps and refine DEPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Correct ordering in typi Created 7 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « apps/load_and_launch_browsertest.cc ('k') | chrome/browser/apps/ad_view_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #import <Cocoa/Cocoa.h>	5 #import <Cocoa/Cocoa.h>

6	6

7 #include "apps/shell_window_registry.h"	7 #include "apps/shell_window_registry.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/mac/scoped_nsobject.h"	9 #include "base/mac/scoped_nsobject.h"

10 #include "chrome/app/chrome_command_ids.h"	10 #include "chrome/app/chrome_command_ids.h"

11 #import "chrome/browser/app_controller_mac.h"	11 #import "chrome/browser/app_controller_mac.h"

	12 #include "chrome/browser/apps/app_browsertest_util.h"

12 #include "chrome/browser/extensions/extension_test_message_listener.h"	13 #include "chrome/browser/extensions/extension_test_message_listener.h"

13 #include "chrome/browser/extensions/platform_app_browsertest_util.h"

14 #include "chrome/browser/ui/browser.h"	14 #include "chrome/browser/ui/browser.h"

15 #include "chrome/browser/ui/browser_list.h"	15 #include "chrome/browser/ui/browser_list.h"

16 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

17 #include "chrome/browser/ui/host_desktop.h"	17 #include "chrome/browser/ui/host_desktop.h"

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

19 #import "chrome/common/chrome_switches.h"	19 #import "chrome/common/chrome_switches.h"

20 #include "chrome/common/extensions/extension.h"	20 #include "chrome/common/extensions/extension.h"

21 #include "chrome/test/base/in_process_browser_test.h"	21 #include "chrome/test/base/in_process_browser_test.h"

22 #include "chrome/test/base/ui_test_utils.h"	22 #include "chrome/test/base/ui_test_utils.h"

23 #include "content/public/browser/web_contents.h"	23 #include "content/public/browser/web_contents.h"

(...skipping 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
105 EXPECT_FALSE(result);	105 EXPECT_FALSE(result);

106 EXPECT_EQ(2u, active_browser_list_->size());	106 EXPECT_EQ(2u, active_browser_list_->size());

107	107

108 Browser* browser = active_browser_list_->get(0);	108 Browser* browser = active_browser_list_->get(0);

109 GURL current_url =	109 GURL current_url =

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

111 EXPECT_EQ(GetAppURL(), current_url.spec());	111 EXPECT_EQ(GetAppURL(), current_url.spec());

112 }	112 }

113	113

114 } // namespace	114 } // namespace

OLD	NEW