OLD | NEW |
1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 def package_name(self): | 164 def package_name(self): |
165 return 'org.chromium.content_shell_apk' | 165 return 'org.chromium.content_shell_apk' |
166 | 166 |
167 def activity_name(self): | 167 def activity_name(self): |
168 return self.package_name() + '/.ContentShellActivity' | 168 return self.package_name() + '/.ContentShellActivity' |
169 | 169 |
170 def library_name(self): | 170 def library_name(self): |
171 return 'libcontent_shell_content_view.so' | 171 return 'libcontent_shell_content_view.so' |
172 | 172 |
173 def additional_resources(self): | 173 def additional_resources(self): |
174 return ['content_resources.pak', 'shell_resources.pak'] | 174 return ['content_resources.pak', 'content_shell.pak', 'shell_resources.p
ak'] |
175 | 175 |
176 def command_line_file(self): | 176 def command_line_file(self): |
177 return '/data/local/tmp/content-shell-command-line' | 177 return '/data/local/tmp/content-shell-command-line' |
178 | 178 |
179 def device_crash_dumps_directory(self): | 179 def device_crash_dumps_directory(self): |
180 return '/data/local/tmp/content-shell-crash-dumps' | 180 return '/data/local/tmp/content-shell-crash-dumps' |
181 | 181 |
182 def additional_command_line_flags(self, use_breakpad): | 182 def additional_command_line_flags(self, use_breakpad): |
183 flags = ['--dump-render-tree', '--encode-binary'] | 183 flags = ['--dump-render-tree', '--encode-binary'] |
184 if use_breakpad: | 184 if use_breakpad: |
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1268 return command | 1268 return command |
1269 | 1269 |
1270 def _read_prompt(self, deadline): | 1270 def _read_prompt(self, deadline): |
1271 last_char = '' | 1271 last_char = '' |
1272 while True: | 1272 while True: |
1273 current_char = self._server_process.read_stdout(deadline, 1) | 1273 current_char = self._server_process.read_stdout(deadline, 1) |
1274 if current_char == ' ': | 1274 if current_char == ' ': |
1275 if last_char in ('#', '$'): | 1275 if last_char in ('#', '$'): |
1276 return | 1276 return |
1277 last_char = current_char | 1277 last_char = current_char |
OLD | NEW |