| 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 #ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ | 5 #ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ |
| 6 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ | 6 #define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 const gfx::Rect& current_screen_bounds, | 117 const gfx::Rect& current_screen_bounds, |
| 118 const gfx::Size& minimum_size, | 118 const gfx::Size& minimum_size, |
| 119 gfx::Rect* bounds); | 119 gfx::Rect* bounds); |
| 120 | 120 |
| 121 // Load a simple test app and create a window. The window must be closed by | 121 // Load a simple test app and create a window. The window must be closed by |
| 122 // the caller in order to terminate the test - use CloseAppWindow(). | 122 // the caller in order to terminate the test - use CloseAppWindow(). |
| 123 // |window_create_options| are the options that will be passed to | 123 // |window_create_options| are the options that will be passed to |
| 124 // chrome.app.window.create() in the test app. | 124 // chrome.app.window.create() in the test app. |
| 125 AppWindow* CreateTestAppWindow(const std::string& window_create_options); | 125 AppWindow* CreateTestAppWindow(const std::string& window_create_options); |
| 126 | 126 |
| 127 // Get the extension icon image for the app window. |
| 128 const gfx::ImageSkia& GetAppIconImage(AppWindow* app_window); |
| 129 |
| 127 private: | 130 private: |
| 128 #if defined(OS_CHROMEOS) | 131 #if defined(OS_CHROMEOS) |
| 129 media_router::MockMediaRouter media_router_; | 132 media_router::MockMediaRouter media_router_; |
| 130 #endif | 133 #endif |
| 131 | 134 |
| 132 DISALLOW_COPY_AND_ASSIGN(PlatformAppBrowserTest); | 135 DISALLOW_COPY_AND_ASSIGN(PlatformAppBrowserTest); |
| 133 }; | 136 }; |
| 134 | 137 |
| 135 class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest { | 138 class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest { |
| 136 public: | 139 public: |
| 137 void SetUpCommandLine(base::CommandLine* command_line) override; | 140 void SetUpCommandLine(base::CommandLine* command_line) override; |
| 138 }; | 141 }; |
| 139 | 142 |
| 140 } // namespace extensions | 143 } // namespace extensions |
| 141 | 144 |
| 142 #endif // CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ | 145 #endif // CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ |
| OLD | NEW |