chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 10826219: launcher: Fix include paths and header guards.

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_unittest.cc

Issue 10826219: launcher: Fix include paths and header guards. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/launcher_app_icon_loader.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"	5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "ash/launcher/launcher_model.h"	11 #include "ash/launcher/launcher_model.h"

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

13 #include "base/file_path.h"	13 #include "base/file_path.h"

14 #include "base/memory/scoped_ptr.h"	14 #include "base/memory/scoped_ptr.h"

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

(...skipping 268 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
284	284

285 GetAppLaunchers(&controller, &actual_launchers);	285 GetAppLaunchers(&controller, &actual_launchers);

286 EXPECT_EQ(expected_launchers, actual_launchers);	286 EXPECT_EQ(expected_launchers, actual_launchers);

287	287

288 // Install \|extension2\| and verify it shows up between the other two.	288 // Install \|extension2\| and verify it shows up between the other two.

289 extension_service_->AddExtension(extension2_.get());	289 extension_service_->AddExtension(extension2_.get());

290 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id());	290 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id());

291 GetAppLaunchers(&controller, &actual_launchers);	291 GetAppLaunchers(&controller, &actual_launchers);

292 EXPECT_EQ(expected_launchers, actual_launchers);	292 EXPECT_EQ(expected_launchers, actual_launchers);

293 }	293 }

OLD	NEW