chrome/browser/extensions/api/app_window/app_window_apitest.cc - Issue 11299326: Revert 170660

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/extensions/api/app_window/app_window_apitest.cc

Issue 11299326: Revert 170660 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years 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/chromeos/extensions/external_filesystem_apitest.cc ('k') | chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc » ('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 "base/string_number_conversions.h"	5 #include "base/string_number_conversions.h"

6 #include "chrome/browser/extensions/extension_test_message_listener.h"	6 #include "chrome/browser/extensions/extension_test_message_listener.h"

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

8 #include "chrome/browser/ui/extensions/native_app_window.h"	8 #include "chrome/browser/ui/extensions/native_app_window.h"

9 #include "chrome/browser/ui/extensions/shell_window.h"	9 #include "chrome/browser/ui/extensions/shell_window.h"

10 #include "ui/gfx/rect.h"	10 #include "ui/gfx/rect.h"

(...skipping 17 matching lines...) Expand all Loading...
28 // with exactly the bounds we set. Is it a bug in our shell window	28 // with exactly the bounds we set. Is it a bug in our shell window

29 // implementation? crbug.com/160252	29 // implementation? crbug.com/160252

30 #ifdef TOOLKIT_GTK	30 #ifdef TOOLKIT_GTK

31 int slop = 50;	31 int slop = 50;

32 #else	32 #else

33 int slop = 0;	33 int slop = 0;

34 #endif // !TOOLKIT_GTK	34 #endif // !TOOLKIT_GTK

35	35

36 ready_listener.Reply(base::IntToString(slop));	36 ready_listener.Reply(base::IntToString(slop));

37 ASSERT_TRUE(success_listener.WaitUntilSatisfied());	37 ASSERT_TRUE(success_listener.WaitUntilSatisfied());

38

39 CloseShellWindowsAndWaitForAppToExit();

40 }	38 }

41	39

42 // TODO(asargent) - Fix onMinimzed event on OSX (crbug.com/162793) and figure	40 // TODO(asargent) - Fix onMinimzed event on OSX (crbug.com/162793) and figure

43 // out what to do about the fact that minimize events don't work under ubuntu	41 // out what to do about the fact that minimize events don't work under ubuntu

44 // unity (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073).	42 // unity (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073).

45 #if defined(TOOLKIT_VIEWS)	43 #if defined(TOOLKIT_VIEWS)

46	44

47 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) {	45 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) {

48 EXPECT_TRUE(	46 EXPECT_TRUE(

49 RunPlatformAppTest("platform_apps/windows_api_properties")) << message_;	47 RunExtensionTest("platform_apps/windows_api_properties")) << message_;

50 }	48 }

51	49

52 #endif // defined(TOOLKIT_VIEWS)	50 #endif // defined(TOOLKIT_VIEWS)

53	51

54 } // namespace extensions	52 } // namespace extensions

OLD	NEW