| 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 "apps/app_window.h" | 5 #include "apps/app_window.h" |
| 6 #include "apps/app_window_registry.h" | 6 #include "apps/app_window_registry.h" |
| 7 #include "apps/ui/native_app_window.h" | 7 #include "apps/ui/native_app_window.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
| 11 #include "chrome/browser/extensions/extension_test_message_listener.h" | 11 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/common/extensions/features/feature_channel.h" | 13 #include "chrome/common/extensions/features/feature_channel.h" |
| 14 #include "chrome/test/base/testing_profile.h" | 14 #include "chrome/test/base/testing_profile.h" |
| 15 #include "ui/base/base_window.h" | 15 #include "ui/base/base_window.h" |
| 16 #include "ui/gfx/rect.h" | 16 #include "ui/gfx/rect.h" |
| 17 | 17 |
| 18 #ifdef TOOLKIT_GTK | |
| 19 #include "content/public/test/test_utils.h" | |
| 20 #endif | |
| 21 | |
| 22 using apps::AppWindow; | 18 using apps::AppWindow; |
| 23 | 19 |
| 24 namespace { | 20 namespace { |
| 25 | 21 |
| 26 class TestAppWindowRegistryObserver : public apps::AppWindowRegistry::Observer { | 22 class TestAppWindowRegistryObserver : public apps::AppWindowRegistry::Observer { |
| 27 public: | 23 public: |
| 28 explicit TestAppWindowRegistryObserver(Profile* profile) | 24 explicit TestAppWindowRegistryObserver(Profile* profile) |
| 29 : profile_(profile), icon_updates_(0) { | 25 : profile_(profile), icon_updates_(0) { |
| 30 apps::AppWindowRegistry::Get(profile_)->AddObserver(this); | 26 apps::AppWindowRegistry::Get(profile_)->AddObserver(this); |
| 31 } | 27 } |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 EXPECT_TRUE(RunPlatformAppTest( | 104 EXPECT_TRUE(RunPlatformAppTest( |
| 109 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; | 105 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; |
| 110 } | 106 } |
| 111 | 107 |
| 112 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { | 108 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { |
| 113 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) | 109 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) |
| 114 << message_; | 110 << message_; |
| 115 } | 111 } |
| 116 | 112 |
| 117 } // namespace extensions | 113 } // namespace extensions |
| OLD | NEW |