chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc - Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/.

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/chromeos/app_mode/kiosk_app_manager_browsertest.cc

Issue 15798019: Use a direct include of strings headers in chrome/browser/chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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 | « no previous file | chrome/browser/chromeos/boot_times_loader.cc » ('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/chromeos/app_mode/kiosk_app_manager.h"	5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"

6	6

7 #include "base/at_exit.h"	7 #include "base/at_exit.h"

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

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "base/stringprintf.h"	11 #include "base/strings/stringprintf.h"

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

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"	14 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"

15 #include "chrome/browser/chromeos/policy/device_local_account.h"	15 #include "chrome/browser/chromeos/policy/device_local_account.h"

16 #include "chrome/browser/chromeos/settings/cros_settings.h"	16 #include "chrome/browser/chromeos/settings/cros_settings.h"

17 #include "chrome/browser/chromeos/settings/cros_settings_names.h"	17 #include "chrome/browser/chromeos/settings/cros_settings_names.h"

18 #include "chrome/browser/prefs/scoped_user_pref_update.h"	18 #include "chrome/browser/prefs/scoped_user_pref_update.h"

19 #include "chrome/common/chrome_paths.h"	19 #include "chrome/common/chrome_paths.h"

20 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

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

(...skipping 253 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
275	275

276 base::FilePath expected_icon_path;	276 base::FilePath expected_icon_path;

277 ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path));	277 ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path));

278 expected_icon_path = expected_icon_path.	278 expected_icon_path = expected_icon_path.

279 AppendASCII(KioskAppManager::kIconCacheDir).	279 AppendASCII(KioskAppManager::kIconCacheDir).

280 AppendASCII(apps[0].app_id).AddExtension(".png");	280 AppendASCII(apps[0].app_id).AddExtension(".png");

281 EXPECT_EQ(expected_icon_path.value(), icon_path_string);	281 EXPECT_EQ(expected_icon_path.value(), icon_path_string);

282 }	282 }

283	283

284 } // namespace chromeos	284 } // namespace chromeos

OLD	NEW