apps/app_shim/extension_app_shim_handler_mac_unittest.cc - Issue 18640003: Updates some includes of chrome_notification_types.h

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: apps/app_shim/extension_app_shim_handler_mac_unittest.cc

Issue 18640003: Updates some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « apps/app_shim/extension_app_shim_handler_mac.cc ('k') | apps/saved_files_service.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 "apps/app_shim/extension_app_shim_handler_mac.h"	5 #include "apps/app_shim/extension_app_shim_handler_mac.h"

6	6

7 #include "apps/app_shim/app_shim_host_mac.h"	7 #include "apps/app_shim/app_shim_host_mac.h"

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

9 #include "chrome/common/chrome_notification_types.h"	9 #include "chrome/browser/chrome_notification_types.h"

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

11 #include "chrome/test/base/testing_profile.h"	11 #include "chrome/test/base/testing_profile.h"

12 #include "content/public/browser/notification_service.h"	12 #include "content/public/browser/notification_service.h"

13 #include "testing/gmock/include/gmock/gmock.h"	13 #include "testing/gmock/include/gmock/gmock.h"

14 #include "testing/gtest/include/gtest/gtest.h"	14 #include "testing/gtest/include/gtest/gtest.h"

15	15

16 namespace apps {	16 namespace apps {

17	17

18 using extensions::Extension;	18 using extensions::Extension;

19 typedef extensions::ShellWindowRegistry::ShellWindowList ShellWindowList;	19 typedef extensions::ShellWindowRegistry::ShellWindowList ShellWindowList;

(...skipping 312 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
332 .WillRepeatedly(Return(&profile_a_));	332 .WillRepeatedly(Return(&profile_a_));

333 EXPECT_CALL(*delegate_, LoadProfileAsync(profile_path_a_, _))	333 EXPECT_CALL(*delegate_, LoadProfileAsync(profile_path_a_, _))

334 .WillOnce(Invoke(delegate_, &MockDelegate::CaptureLoadProfileCallback));	334 .WillOnce(Invoke(delegate_, &MockDelegate::CaptureLoadProfileCallback));

335 handler_->OnShimLaunch(&host_aa_, APP_SHIM_LAUNCH_NORMAL);	335 handler_->OnShimLaunch(&host_aa_, APP_SHIM_LAUNCH_NORMAL);

336 EXPECT_FALSE(handler_->FindHost(&profile_a_, kTestAppIdA));	336 EXPECT_FALSE(handler_->FindHost(&profile_a_, kTestAppIdA));

337 delegate_->RunLoadProfileCallback(profile_path_a_, &profile_a_);	337 delegate_->RunLoadProfileCallback(profile_path_a_, &profile_a_);

338 EXPECT_TRUE(handler_->FindHost(&profile_a_, kTestAppIdA));	338 EXPECT_TRUE(handler_->FindHost(&profile_a_, kTestAppIdA));

339 }	339 }

340	340

341 } // namespace apps	341 } // namespace apps

OLD	NEW