Index: content/shell/shell.cc |
diff --git a/content/shell/shell.cc b/content/shell/shell.cc |
index d4e68c04fa2d1dfecdb70af50e5d85e836a20472..948ffdd35df307556e14a894c1eee8a9c8ba66ad 100644 |
--- a/content/shell/shell.cc |
+++ b/content/shell/shell.cc |
@@ -30,9 +30,9 @@ |
#include "content/shell/shell_switches.h" |
#include "content/shell/webkit_test_controller.h" |
-// Content area size for newly created windows. |
-static const int kTestWindowWidth = 800; |
-static const int kTestWindowHeight = 600; |
+#if defined(USE_AURA) |
+#include "content/shell/shell_stacking_client_ash.h" |
+#endif |
namespace content { |
@@ -121,12 +121,16 @@ Shell* Shell::CreateNewWindow(BrowserContext* browser_context, |
SiteInstance* site_instance, |
int routing_id, |
const gfx::Size& initial_size) { |
- WebContents::CreateParams create_params(browser_context, site_instance); |
+ WebContents::CreateParams create_params( |
+ browser_context, site_instance); |
sky
2013/01/16 00:55:39
Why are you changing this?
Nayan
2013/01/16 01:07:29
Done.
|
create_params.routing_id = routing_id; |
if (!initial_size.IsEmpty()) |
create_params.initial_size = initial_size; |
else |
- create_params.initial_size = gfx::Size(kTestWindowWidth, kTestWindowHeight); |
+ create_params.initial_size = |
+ gfx::Size(kTestWindowWidth, kTestWindowHeight); |
sky
2013/01/16 00:55:39
Why are you changing this line?
Nayan
2013/01/16 01:07:29
Done.
|
+ create_params.context = Shell::stacking_client_->GetDefaultParent( |
sky
2013/01/16 00:55:39
This is aura specific, right?
Nayan
2013/01/16 01:07:29
Done.
|
+ NULL, NULL, gfx::Rect()); |
WebContents* web_contents = WebContents::Create(create_params); |
Shell* shell = CreateShell(web_contents); |
if (!url.is_empty()) |