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 "content/shell/shell_browser_main_parts.h" | 5 #include "content/shell/shell_browser_main_parts.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 11 matching lines...) Expand all Loading... | |
22 #if defined(OS_ANDROID) | 22 #if defined(OS_ANDROID) |
23 #include "net/base/network_change_notifier.h" | 23 #include "net/base/network_change_notifier.h" |
24 #include "net/android/network_change_notifier_factory.h" | 24 #include "net/android/network_change_notifier_factory.h" |
25 #endif | 25 #endif |
26 | 26 |
27 namespace content { | 27 namespace content { |
28 | 28 |
29 static GURL GetStartupURL() { | 29 static GURL GetStartupURL() { |
30 const CommandLine::StringVector& args = | 30 const CommandLine::StringVector& args = |
31 CommandLine::ForCurrentProcess()->GetArgs(); | 31 CommandLine::ForCurrentProcess()->GetArgs(); |
32 | |
33 #if defined(OS_ANDROID) | |
klobag.chromium
2012/07/27 19:42:22
Consider to modify the commandLine args to pass ""
Ted C
2012/07/27 20:31:15
Ah ha...I see the load URL need now. We need to f
no sievers
2012/07/31 01:28:44
Hrm, I had no immediate luck. gurl.cc would dcheck
| |
34 // Delay renderer creation on Android until surface is ready. | |
35 return GURL(); | |
36 #endif | |
37 | |
32 if (args.empty()) | 38 if (args.empty()) |
33 return GURL("http://www.google.com/"); | 39 return GURL("http://www.google.com/"); |
34 | 40 |
35 return GURL(args[0]); | 41 return GURL(args[0]); |
36 } | 42 } |
37 | 43 |
38 ShellBrowserMainParts::ShellBrowserMainParts( | 44 ShellBrowserMainParts::ShellBrowserMainParts( |
39 const MainFunctionParams& parameters) | 45 const MainFunctionParams& parameters) |
40 : BrowserMainParts(), | 46 : BrowserMainParts(), |
41 parameters_(parameters), | 47 parameters_(parameters), |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
103 return !run_message_loop_; | 109 return !run_message_loop_; |
104 } | 110 } |
105 | 111 |
106 void ShellBrowserMainParts::PostMainMessageLoopRun() { | 112 void ShellBrowserMainParts::PostMainMessageLoopRun() { |
107 if (devtools_delegate_) | 113 if (devtools_delegate_) |
108 devtools_delegate_->Stop(); | 114 devtools_delegate_->Stop(); |
109 browser_context_.reset(); | 115 browser_context_.reset(); |
110 } | 116 } |
111 | 117 |
112 } // namespace | 118 } // namespace |
OLD | NEW |