Landing 37604:38097 merge

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5110 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 1 deletions

diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index dfc89fb..03e6f3c 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/webkit/glue/inspector_client_impl.cc
@@ -134,6 +134,7 @@ void WebInspectorClient::detachWindow() {
 
 void WebInspectorClient::setAttachedWindowHeight(unsigned int height) {
   // TODO(dglazkov): Implement this
+  NOTIMPLEMENTED();
 }
 
 static void invalidateNodeBoundingRect(WebViewImpl* web_view) {
@@ -166,10 +167,24 @@ void WebInspectorClient::hideHighlight() {
 
 void WebInspectorClient::inspectedURLChanged(const String& newURL) {
   // TODO(jackson): Implement this
+  NOTIMPLEMENTED();
 }
 
 String WebInspectorClient::localizedStringsURL() {
-  notImplemented();
+  NOTIMPLEMENTED();
   return String();
 }
 
+void WebInspectorClient::populateSetting(
+    const String& key, InspectorController::Setting&) {
+  NOTIMPLEMENTED();
+}
+
+void WebInspectorClient::storeSetting(
+    const String& key, const InspectorController::Setting&) {
+  NOTIMPLEMENTED();
+}
+
+void WebInspectorClient::removeSetting(const String& key) {
+  NOTIMPLEMENTED();
+}