Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1029)

Side by Side Diff: content/shell/browser/layout_test/layout_test_devtools_frontend.cc

Issue 1144393004: [DevTools] Load DevTools frontend without iframe (chromium part). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-test
Patch Set: Addressed review comments Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/layout_test/layout_test_devtools_frontend.h" 5 #include "content/shell/browser/layout_test/layout_test_devtools_frontend.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 NOTREACHED(); 42 NOTREACHED();
43 return GURL(); 43 return GURL();
44 } 44 }
45 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
46 // On Mac, the executable is in 46 // On Mac, the executable is in
47 // out/Release/Content Shell.app/Contents/MacOS/Content Shell. 47 // out/Release/Content Shell.app/Contents/MacOS/Content Shell.
48 // We need to go up 3 directories to get to out/Release. 48 // We need to go up 3 directories to get to out/Release.
49 dir_exe = dir_exe.AppendASCII("../../.."); 49 dir_exe = dir_exe.AppendASCII("../../..");
50 #endif 50 #endif
51 base::FilePath dev_tools_path = 51 base::FilePath dev_tools_path =
52 dir_exe.AppendASCII("resources/inspector/devtools.html"); 52 dir_exe.AppendASCII("resources/inspector/inspector.html");
53 53
54 GURL result = net::FilePathToFileURL(dev_tools_path); 54 GURL result = net::FilePathToFileURL(dev_tools_path);
55 if (!settings.empty()) 55 if (!settings.empty())
56 result = GURL(base::StringPrintf("%s?settings=%s&experiments=true", 56 result = GURL(base::StringPrintf("%s?settings=%s&experiments=true",
57 result.spec().c_str(), 57 result.spec().c_str(),
58 settings.c_str())); 58 settings.c_str()));
59 return result; 59 return result;
60 } 60 }
61 61
62 void LayoutTestDevToolsFrontend::ReuseFrontend(const std::string& settings, 62 void LayoutTestDevToolsFrontend::ReuseFrontend(const std::string& settings,
(...skipping 16 matching lines...) Expand all
79 DevToolsAgentHost* agent_host, bool replaced) { 79 DevToolsAgentHost* agent_host, bool replaced) {
80 // Do not close the front-end shell. 80 // Do not close the front-end shell.
81 } 81 }
82 82
83 void LayoutTestDevToolsFrontend::RenderProcessGone( 83 void LayoutTestDevToolsFrontend::RenderProcessGone(
84 base::TerminationStatus status) { 84 base::TerminationStatus status) {
85 BlinkTestController::Get()->DevToolsProcessCrashed(); 85 BlinkTestController::Get()->DevToolsProcessCrashed();
86 } 86 }
87 87
88 } // namespace content 88 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/devtools/devtools_client.cc ('k') | content/shell/browser/shell_devtools_frontend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698