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

Side by Side Diff: third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.cpp

Issue 2738453004: Avoid using declarations in headers which introduce symbol conflicts. (Closed)
Patch Set: Created 3 years, 9 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 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Samsung Electronics. All rights reserved. 3 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 26 matching lines...) Expand all
37 #include "core/frame/LocalFrame.h" 37 #include "core/frame/LocalFrame.h"
38 #include "core/inspector/InspectedFrames.h" 38 #include "core/inspector/InspectedFrames.h"
39 #include "core/page/Page.h" 39 #include "core/page/Page.h"
40 #include "modules/storage/Storage.h" 40 #include "modules/storage/Storage.h"
41 #include "modules/storage/StorageNamespace.h" 41 #include "modules/storage/StorageNamespace.h"
42 #include "modules/storage/StorageNamespaceController.h" 42 #include "modules/storage/StorageNamespaceController.h"
43 #include "platform/weborigin/SecurityOrigin.h" 43 #include "platform/weborigin/SecurityOrigin.h"
44 44
45 namespace blink { 45 namespace blink {
46 46
47 using protocol::Response;
48
47 namespace DOMStorageAgentState { 49 namespace DOMStorageAgentState {
48 static const char domStorageAgentEnabled[] = "domStorageAgentEnabled"; 50 static const char domStorageAgentEnabled[] = "domStorageAgentEnabled";
49 }; 51 };
50 52
51 static Response toResponse(ExceptionState& exceptionState) { 53 static Response toResponse(ExceptionState& exceptionState) {
52 if (!exceptionState.hadException()) 54 if (!exceptionState.hadException())
53 return Response::OK(); 55 return Response::OK();
54 return Response::Error(DOMException::getErrorName(exceptionState.code()) + 56 return Response::Error(DOMException::getErrorName(exceptionState.code()) +
55 " " + exceptionState.message()); 57 " " + exceptionState.message());
56 } 58 }
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 StorageNamespace* sessionStorage = 226 StorageNamespace* sessionStorage =
225 StorageNamespaceController::from(m_page)->sessionStorage(); 227 StorageNamespaceController::from(m_page)->sessionStorage();
226 if (!sessionStorage) 228 if (!sessionStorage)
227 return Response::Error("SessionStorage is not supported"); 229 return Response::Error("SessionStorage is not supported");
228 storageArea = 230 storageArea =
229 sessionStorage->storageArea(frame->document()->getSecurityOrigin()); 231 sessionStorage->storageArea(frame->document()->getSecurityOrigin());
230 return Response::OK(); 232 return Response::OK();
231 } 233 }
232 234
233 } // namespace blink 235 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698