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 #include "content/shell/browser/shell.h" | 5 #include "content/shell/browser/shell.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "content/shell/browser/webkit_test_controller.h" | 28 #include "content/shell/browser/webkit_test_controller.h" |
29 #include "content/shell/common/shell_messages.h" | 29 #include "content/shell/common/shell_messages.h" |
30 #include "content/shell/common/shell_switches.h" | 30 #include "content/shell/common/shell_switches.h" |
31 | 31 |
32 #if defined(USE_AURA) && !defined(TOOLKIT_VIEWS) | 32 #if defined(USE_AURA) && !defined(TOOLKIT_VIEWS) |
33 #include "content/shell/browser/shell_aura.h" | 33 #include "content/shell/browser/shell_aura.h" |
34 #endif | 34 #endif |
35 | 35 |
36 namespace content { | 36 namespace content { |
37 | 37 |
38 const int Shell::kDefaultTestWindowWidthDip = 800; | 38 const int Shell::kDefaultTestWindowWidthDip = 2560; |
39 const int Shell::kDefaultTestWindowHeightDip = 600; | 39 const int Shell::kDefaultTestWindowHeightDip = 1700; |
40 | 40 |
41 std::vector<Shell*> Shell::windows_; | 41 std::vector<Shell*> Shell::windows_; |
42 base::Callback<void(Shell*)> Shell::shell_created_callback_; | 42 base::Callback<void(Shell*)> Shell::shell_created_callback_; |
43 | 43 |
44 bool Shell::quit_message_loop_ = true; | 44 bool Shell::quit_message_loop_ = true; |
45 | 45 |
46 class Shell::DevToolsWebContentsObserver : public WebContentsObserver { | 46 class Shell::DevToolsWebContentsObserver : public WebContentsObserver { |
47 public: | 47 public: |
48 DevToolsWebContentsObserver(Shell* shell, WebContents* web_contents) | 48 DevToolsWebContentsObserver(Shell* shell, WebContents* web_contents) |
49 : WebContentsObserver(web_contents), | 49 : WebContentsObserver(web_contents), |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 if (entry) | 353 if (entry) |
354 PlatformSetTitle(entry->GetTitle()); | 354 PlatformSetTitle(entry->GetTitle()); |
355 } | 355 } |
356 | 356 |
357 void Shell::OnDevToolsWebContentsDestroyed() { | 357 void Shell::OnDevToolsWebContentsDestroyed() { |
358 devtools_observer_.reset(); | 358 devtools_observer_.reset(); |
359 devtools_frontend_ = NULL; | 359 devtools_frontend_ = NULL; |
360 } | 360 } |
361 | 361 |
362 } // namespace content | 362 } // namespace content |
OLD | NEW |