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 11 matching lines...) Expand all Loading... |
22 #include "content/public/common/renderer_preferences.h" | 22 #include "content/public/common/renderer_preferences.h" |
23 #include "content/shell/browser/notify_done_forwarder.h" | 23 #include "content/shell/browser/notify_done_forwarder.h" |
24 #include "content/shell/browser/shell_browser_main_parts.h" | 24 #include "content/shell/browser/shell_browser_main_parts.h" |
25 #include "content/shell/browser/shell_content_browser_client.h" | 25 #include "content/shell/browser/shell_content_browser_client.h" |
26 #include "content/shell/browser/shell_devtools_frontend.h" | 26 #include "content/shell/browser/shell_devtools_frontend.h" |
27 #include "content/shell/browser/shell_javascript_dialog_manager.h" | 27 #include "content/shell/browser/shell_javascript_dialog_manager.h" |
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) |
| 33 #include "content/shell/browser/shell_aura.h" |
| 34 #endif |
| 35 |
32 namespace content { | 36 namespace content { |
33 | 37 |
34 const int Shell::kDefaultTestWindowWidthDip = 800; | 38 const int Shell::kDefaultTestWindowWidthDip = 800; |
35 const int Shell::kDefaultTestWindowHeightDip = 600; | 39 const int Shell::kDefaultTestWindowHeightDip = 600; |
36 | 40 |
37 std::vector<Shell*> Shell::windows_; | 41 std::vector<Shell*> Shell::windows_; |
38 base::Callback<void(Shell*)> Shell::shell_created_callback_; | 42 base::Callback<void(Shell*)> Shell::shell_created_callback_; |
39 | 43 |
40 bool Shell::quit_message_loop_ = true; | 44 bool Shell::quit_message_loop_ = true; |
41 | 45 |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 if (entry) | 351 if (entry) |
348 PlatformSetTitle(entry->GetTitle()); | 352 PlatformSetTitle(entry->GetTitle()); |
349 } | 353 } |
350 | 354 |
351 void Shell::OnDevToolsWebContentsDestroyed() { | 355 void Shell::OnDevToolsWebContentsDestroyed() { |
352 devtools_observer_.reset(); | 356 devtools_observer_.reset(); |
353 devtools_frontend_ = NULL; | 357 devtools_frontend_ = NULL; |
354 } | 358 } |
355 | 359 |
356 } // namespace content | 360 } // namespace content |
OLD | NEW |