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

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/InspectorDatabaseAgent.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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "modules/webdatabase/SQLTransactionErrorCallback.h" 47 #include "modules/webdatabase/SQLTransactionErrorCallback.h"
48 #include "modules/webdatabase/sqlite/SQLValue.h" 48 #include "modules/webdatabase/sqlite/SQLValue.h"
49 #include "wtf/RefCounted.h" 49 #include "wtf/RefCounted.h"
50 #include "wtf/Vector.h" 50 #include "wtf/Vector.h"
51 51
52 typedef blink::protocol::Database::Backend::ExecuteSQLCallback 52 typedef blink::protocol::Database::Backend::ExecuteSQLCallback
53 ExecuteSQLCallback; 53 ExecuteSQLCallback;
54 54
55 namespace blink { 55 namespace blink {
56 56
57 using protocol::Maybe;
58 using protocol::Response;
59
57 namespace DatabaseAgentState { 60 namespace DatabaseAgentState {
58 static const char databaseAgentEnabled[] = "databaseAgentEnabled"; 61 static const char databaseAgentEnabled[] = "databaseAgentEnabled";
59 }; 62 };
60 63
61 namespace { 64 namespace {
62 65
63 class ExecuteSQLCallbackWrapper : public RefCounted<ExecuteSQLCallbackWrapper> { 66 class ExecuteSQLCallbackWrapper : public RefCounted<ExecuteSQLCallbackWrapper> {
64 public: 67 public:
65 static PassRefPtr<ExecuteSQLCallbackWrapper> create( 68 static PassRefPtr<ExecuteSQLCallbackWrapper> create(
66 std::unique_ptr<ExecuteSQLCallback> callback) { 69 std::unique_ptr<ExecuteSQLCallback> callback) {
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 return it->value->database(); 364 return it->value->database();
362 } 365 }
363 366
364 DEFINE_TRACE(InspectorDatabaseAgent) { 367 DEFINE_TRACE(InspectorDatabaseAgent) {
365 visitor->trace(m_page); 368 visitor->trace(m_page);
366 visitor->trace(m_resources); 369 visitor->trace(m_resources);
367 InspectorBaseAgent::trace(visitor); 370 InspectorBaseAgent::trace(visitor);
368 } 371 }
369 372
370 } // namespace blink 373 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698