| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/common/content_client.h" | 5 #include "content/public/common/content_client.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/strings/string_piece.h" | 8 #include "base/strings/string_piece.h" |
| 9 #include "ui/gfx/image/image.h" | 9 #include "ui/gfx/image/image.h" |
| 10 #include "webkit/user_agent/user_agent.h" | 10 #include "webkit/common/user_agent/user_agent.h" |
| 11 | 11 |
| 12 #if defined(ENABLE_PLUGINS) | 12 #if defined(ENABLE_PLUGINS) |
| 13 #include "webkit/plugins/ppapi/host_globals.h" | 13 #include "webkit/plugins/ppapi/host_globals.h" |
| 14 #endif | 14 #endif |
| 15 | 15 |
| 16 namespace content { | 16 namespace content { |
| 17 | 17 |
| 18 static ContentClient* g_client; | 18 static ContentClient* g_client; |
| 19 | 19 |
| 20 class InternalTestInitializer { | 20 class InternalTestInitializer { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 int* sandbox_profile_resource_id) const { | 122 int* sandbox_profile_resource_id) const { |
| 123 return false; | 123 return false; |
| 124 } | 124 } |
| 125 | 125 |
| 126 std::string ContentClient::GetCarbonInterposePath() const { | 126 std::string ContentClient::GetCarbonInterposePath() const { |
| 127 return std::string(); | 127 return std::string(); |
| 128 } | 128 } |
| 129 #endif | 129 #endif |
| 130 | 130 |
| 131 } // namespace content | 131 } // namespace content |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 15702003:
Move webkit/user_agent/ into webkit/common (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src