Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(817)

Side by Side Diff: chrome/browser/extensions/api/app_window/app_window_apitest.cc

Issue 11818065: OK, here's john's patch plus my sync stuff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Redisable PlatformAppBrowserTest.WebContentsHasFocus on aura Created 7 years, 10 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
OLDNEW
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/run_loop.h" 5 #include "base/run_loop.h"
6 #include "base/strings/string_number_conversions.h" 6 #include "base/strings/string_number_conversions.h"
7 #include "chrome/browser/extensions/extension_test_message_listener.h" 7 #include "chrome/browser/extensions/extension_test_message_listener.h"
8 #include "chrome/browser/extensions/platform_app_browsertest_util.h" 8 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
9 #include "chrome/browser/extensions/shell_window_registry.h" 9 #include "chrome/browser/extensions/shell_window_registry.h"
10 #include "chrome/browser/ui/base_window.h" 10 #include "chrome/browser/ui/base_window.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 ShellWindow* shell_window = GetFirstShellWindow(); 117 ShellWindow* shell_window = GetFirstShellWindow();
118 ASSERT_TRUE(shell_window); 118 ASSERT_TRUE(shell_window);
119 EXPECT_NE(std::string::npos, 119 EXPECT_NE(std::string::npos,
120 shell_window->app_icon_url().spec().find("icon.png")); 120 shell_window->app_icon_url().spec().find("icon.png"));
121 EXPECT_EQ(1, test_observer->icon_updates()); 121 EXPECT_EQ(1, test_observer->icon_updates());
122 } 122 }
123 123
124 // TODO(asargent) - Figure out what to do about the fact that minimize events 124 // TODO(asargent) - Figure out what to do about the fact that minimize events
125 // don't work under ubuntu unity. 125 // don't work under ubuntu unity.
126 // (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073). 126 // (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073).
127 #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX) 127 // TODO(linux_aura) http://crbug.com/163931
128 #if (defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)) && !(defined(OS_LINUX) && !de fined(OS_CHROMEOS) && defined(USE_AURA))
128 129
129 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { 130 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) {
130 EXPECT_TRUE( 131 EXPECT_TRUE(
131 RunExtensionTest("platform_apps/windows_api_properties")) << message_; 132 RunExtensionTest("platform_apps/windows_api_properties")) << message_;
132 } 133 }
133 134
134 #endif // defined(TOOLKIT_VIEWS) 135 #endif // defined(TOOLKIT_VIEWS)
135 136
136 } // namespace extensions 137 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/download/save_page_browsertest.cc ('k') | chrome/browser/extensions/extension_url_rewrite_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698