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

Side by Side Diff: content/shell/renderer/test_runner/test_interfaces.cc

Issue 1079843002: DevTools: allow storing devtools preferences on the browser side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restored settings param Created 5 years, 8 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
« no previous file with comments | « content/shell/browser/shell_devtools_frontend.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/test_runner/test_interfaces.h" 5 #include "content/shell/renderer/test_runner/test_interfaces.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 test_runner_->setShouldDumpFrameLoadCallbacks(true); 111 test_runner_->setShouldDumpFrameLoadCallbacks(true);
112 if (spec.find("/dumpAsText/") != std::string::npos) { 112 if (spec.find("/dumpAsText/") != std::string::npos) {
113 test_runner_->setShouldDumpAsText(true); 113 test_runner_->setShouldDumpAsText(true);
114 test_runner_->setShouldGeneratePixelResults(false); 114 test_runner_->setShouldGeneratePixelResults(false);
115 } 115 }
116 if (spec.find("/inspector/") != std::string::npos || 116 if (spec.find("/inspector/") != std::string::npos ||
117 spec.find("/inspector-enabled/") != std::string::npos) 117 spec.find("/inspector-enabled/") != std::string::npos)
118 test_runner_->ClearDevToolsLocalStorage(); 118 test_runner_->ClearDevToolsLocalStorage();
119 if (spec.find("/inspector/") != std::string::npos) { 119 if (spec.find("/inspector/") != std::string::npos) {
120 // Subfolder name determines default panel to open. 120 // Subfolder name determines default panel to open.
121 std::string settings = "";
122 std::string test_path = spec.substr(spec.find("/inspector/") + 11); 121 std::string test_path = spec.substr(spec.find("/inspector/") + 11);
123 size_t slash_index = test_path.find("/"); 122 std::string settings = base::StringPrintf(
Tom Sepez 2015/04/13 16:15:48 Even thought this is only for testing, and even th
pfeldman 2015/04/14 09:06:33 Done.
124 std::string test_path_setting = base::StringPrintf( 123 "{\"testPath\":\"\\\"%s\\\"\"}", spec.c_str());
125 "\"testPath\":\"\\\"%s\\\"\"", spec.c_str()); 124 test_runner_->ShowDevTools(settings, std::string());
126
127 // TODO(pfeldman): remove once migrated to testPath.
128 std::string last_active_panel;
129 if (slash_index != std::string::npos) {
130 last_active_panel = base::StringPrintf(
131 ",\"lastActivePanel\":\"\\\"%s\\\"\"",
132 test_path.substr(0, slash_index).c_str());
133 }
134
135 test_runner_->ShowDevTools(base::StringPrintf("{%s%s}",
136 test_path_setting.c_str(), last_active_panel.c_str()), std::string());
137 } 125 }
138 if (spec.find("/viewsource/") != std::string::npos) { 126 if (spec.find("/viewsource/") != std::string::npos) {
139 test_runner_->setShouldEnableViewSource(true); 127 test_runner_->setShouldEnableViewSource(true);
140 test_runner_->setShouldGeneratePixelResults(false); 128 test_runner_->setShouldGeneratePixelResults(false);
141 test_runner_->setShouldDumpAsMarkup(true); 129 test_runner_->setShouldDumpAsMarkup(true);
142 } 130 }
143 } 131 }
144 132
145 void TestInterfaces::WindowOpened(WebTestProxyBase* proxy) { 133 void TestInterfaces::WindowOpened(WebTestProxyBase* proxy) {
146 window_list_.push_back(proxy); 134 window_list_.push_back(proxy);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 170
183 blink::WebThemeEngine* TestInterfaces::GetThemeEngine() { 171 blink::WebThemeEngine* TestInterfaces::GetThemeEngine() {
184 if (!test_runner_->UseMockTheme()) 172 if (!test_runner_->UseMockTheme())
185 return 0; 173 return 0;
186 if (!theme_engine_.get()) 174 if (!theme_engine_.get())
187 theme_engine_.reset(new MockWebThemeEngine()); 175 theme_engine_.reset(new MockWebThemeEngine());
188 return theme_engine_.get(); 176 return theme_engine_.get();
189 } 177 }
190 178
191 } // namespace content 179 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_devtools_frontend.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698