| 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/shell_window.h" |
| 5 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 6 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 7 #include "chrome/browser/extensions/extension_test_message_listener.h" | 8 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 8 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 9 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
| 9 #include "chrome/browser/extensions/shell_window_registry.h" | 10 #include "chrome/browser/extensions/shell_window_registry.h" |
| 10 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/extensions/native_app_window.h" | 12 #include "chrome/browser/ui/extensions/native_app_window.h" |
| 12 #include "chrome/browser/ui/extensions/shell_window.h" | |
| 13 #include "chrome/test/base/testing_profile.h" | 13 #include "chrome/test/base/testing_profile.h" |
| 14 #include "ui/base/base_window.h" | 14 #include "ui/base/base_window.h" |
| 15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
| 16 | 16 |
| 17 #ifdef TOOLKIT_GTK | 17 #ifdef TOOLKIT_GTK |
| 18 #include "content/public/test/test_utils.h" | 18 #include "content/public/test/test_utils.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 using apps::ShellWindow; |
| 22 |
| 21 namespace { | 23 namespace { |
| 22 | 24 |
| 23 class TestShellWindowRegistryObserver | 25 class TestShellWindowRegistryObserver |
| 24 : public extensions::ShellWindowRegistry::Observer { | 26 : public extensions::ShellWindowRegistry::Observer { |
| 25 public: | 27 public: |
| 26 explicit TestShellWindowRegistryObserver(Profile* profile) | 28 explicit TestShellWindowRegistryObserver(Profile* profile) |
| 27 : profile_(profile), | 29 : profile_(profile), |
| 28 icon_updates_(0) { | 30 icon_updates_(0) { |
| 29 extensions::ShellWindowRegistry::Get(profile_)->AddObserver(this); | 31 extensions::ShellWindowRegistry::Get(profile_)->AddObserver(this); |
| 30 } | 32 } |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 #if defined(TOOLKIT_VIEWS) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && de
fined(USE_AURA)) | 131 #if defined(TOOLKIT_VIEWS) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && de
fined(USE_AURA)) |
| 130 | 132 |
| 131 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { | 133 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { |
| 132 EXPECT_TRUE( | 134 EXPECT_TRUE( |
| 133 RunExtensionTest("platform_apps/windows_api_properties")) << message_; | 135 RunExtensionTest("platform_apps/windows_api_properties")) << message_; |
| 134 } | 136 } |
| 135 | 137 |
| 136 #endif // defined(TOOLKIT_VIEWS) | 138 #endif // defined(TOOLKIT_VIEWS) |
| 137 | 139 |
| 138 } // namespace extensions | 140 } // namespace extensions |
| OLD | NEW |