chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 332163006: Manage settings window icon for multi profile

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/launcher/chrome_launcher_controller_browsertest.cc

Issue 332163006: Manage settings window icon for multi profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix browsertest Created 6 years, 6 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 | « chrome/browser/ui/ash/launcher/browser_status_monitor.cc ('k') | chrome/browser/ui/ash/launcher/launcher_item_util.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/launcher/chrome_launcher_controller.h"	5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

6	6

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

8 #include "apps/app_window_registry.h"	8 #include "apps/app_window_registry.h"

9 #include "apps/ui/native_app_window.h"	9 #include "apps/ui/native_app_window.h"

10 #include "ash/ash_switches.h"	10 #include "ash/ash_switches.h"

(...skipping 2111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2122 // Open a settings window. Number of browser items should remain unchanged,	2122 // Open a settings window. Number of browser items should remain unchanged,

2123 // number of shelf items should increase.	2123 // number of shelf items should increase.

2124 settings_manager->ShowChromePageForProfile(	2124 settings_manager->ShowChromePageForProfile(

2125 browser()->profile(),	2125 browser()->profile(),

2126 chrome::GetSettingsUrl(std::string()));	2126 chrome::GetSettingsUrl(std::string()));

2127 Browser* settings_browser =	2127 Browser* settings_browser =

2128 settings_manager->FindBrowserForProfile(browser()->profile());	2128 settings_manager->FindBrowserForProfile(browser()->profile());

2129 ASSERT_TRUE(settings_browser);	2129 ASSERT_TRUE(settings_browser);

2130 EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false));	2130 EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false));

2131 EXPECT_EQ(item_count + 1, shelf_model->item_count());	2131 EXPECT_EQ(item_count + 1, shelf_model->item_count());

	2132

	2133 // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded.

	2134 // crbug.com/230464.

2132 }	2135 }

OLD	NEW