| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 | 8 |
| 9 MSVC_PUSH_WARNING_LEVEL(0); | 9 MSVC_PUSH_WARNING_LEVEL(0); |
| 10 #include "DOMWindow.h" | 10 #include "DOMWindow.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 150 |
| 151 void InspectorClientImpl::inspectorWindowObjectCleared() { | 151 void InspectorClientImpl::inspectorWindowObjectCleared() { |
| 152 NOTIMPLEMENTED(); | 152 NOTIMPLEMENTED(); |
| 153 } | 153 } |
| 154 | 154 |
| 155 void InspectorClientImpl::LoadSettings() { | 155 void InspectorClientImpl::LoadSettings() { |
| 156 if (settings_) | 156 if (settings_) |
| 157 return; | 157 return; |
| 158 | 158 |
| 159 settings_.set(new SettingsMap); | 159 settings_.set(new SettingsMap); |
| 160 String data = webkit_glue::StdWStringToString( | 160 String data = webkit_glue::WebStringToString( |
| 161 inspected_web_view_->GetInspectorSettings()); | 161 inspected_web_view_->inspectorSettings()); |
| 162 if (data.isEmpty()) | 162 if (data.isEmpty()) |
| 163 return; | 163 return; |
| 164 | 164 |
| 165 Vector<String> entries; | 165 Vector<String> entries; |
| 166 data.split("\n", entries); | 166 data.split("\n", entries); |
| 167 for (Vector<String>::iterator it = entries.begin(); | 167 for (Vector<String>::iterator it = entries.begin(); |
| 168 it != entries.end(); ++it) { | 168 it != entries.end(); ++it) { |
| 169 Vector<String> tokens; | 169 Vector<String> tokens; |
| 170 it->split(":", tokens); | 170 it->split(":", tokens); |
| 171 if (tokens.size() != 3) | 171 if (tokens.size() != 3) |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 case InspectorController::Setting::StringVectorType: | 225 case InspectorController::Setting::StringVectorType: |
| 226 NOTIMPLEMENTED(); | 226 NOTIMPLEMENTED(); |
| 227 break; | 227 break; |
| 228 default: | 228 default: |
| 229 NOTREACHED(); | 229 NOTREACHED(); |
| 230 break; | 230 break; |
| 231 } | 231 } |
| 232 data.append(entry); | 232 data.append(entry); |
| 233 data.append("\n"); | 233 data.append("\n"); |
| 234 } | 234 } |
| 235 inspected_web_view_->delegate()->UpdateInspectorSettings( | 235 inspected_web_view_->setInspectorSettings( |
| 236 webkit_glue::StringToStdWString(data)); | 236 webkit_glue::StringToWebString(data)); |
| 237 if (inspected_web_view_->client()) |
| 238 inspected_web_view_->client()->didUpdateInspectorSettings(); |
| 237 } | 239 } |
| OLD | NEW |