Chromium Code Reviews| 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_devtools_manager_delegate.h" | 5 #include "content/shell/browser/shell_devtools_manager_delegate.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 #if defined(OS_ANDROID) | 197 #if defined(OS_ANDROID) |
| 198 return std::string(); | 198 return std::string(); |
| 199 #else | 199 #else |
| 200 return ResourceBundle::GetSharedInstance().GetRawDataResource( | 200 return ResourceBundle::GetSharedInstance().GetRawDataResource( |
| 201 IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string(); | 201 IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string(); |
| 202 #endif | 202 #endif |
| 203 } | 203 } |
| 204 | 204 |
| 205 std::string ShellDevToolsManagerDelegate::GetFrontendResource( | 205 std::string ShellDevToolsManagerDelegate::GetFrontendResource( |
| 206 const std::string& path) { | 206 const std::string& path) { |
| 207 #if defined(OS_ANDROID) | |
| 208 return std::string(); | |
| 209 #else | |
| 207 return content::DevToolsFrontendHost::GetFrontendResource(path).as_string(); | 210 return content::DevToolsFrontendHost::GetFrontendResource(path).as_string(); |
|
dgozman
2017/03/20 22:43:20
We should guard the include somewhere as well.
chenwilliam
2017/03/20 23:59:40
Done.
| |
| 211 #endif | |
| 208 } | 212 } |
| 209 | 213 |
| 210 } // namespace content | 214 } // namespace content |
| OLD | NEW |