| 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 "content/public/common/user_agent.h" |
| 9 #include "ui/gfx/image/image.h" | 10 #include "ui/gfx/image/image.h" |
| 10 | 11 |
| 11 namespace content { | 12 namespace content { |
| 12 | 13 |
| 13 static ContentClient* g_client; | 14 static ContentClient* g_client; |
| 14 | 15 |
| 15 class InternalTestInitializer { | 16 class InternalTestInitializer { |
| 16 public: | 17 public: |
| 17 static ContentBrowserClient* SetBrowser(ContentBrowserClient* b) { | 18 static ContentBrowserClient* SetBrowser(ContentBrowserClient* b) { |
| 18 ContentBrowserClient* rv = g_client->browser_; | 19 ContentBrowserClient* rv = g_client->browser_; |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 int* sandbox_profile_resource_id) const { | 113 int* sandbox_profile_resource_id) const { |
| 113 return false; | 114 return false; |
| 114 } | 115 } |
| 115 | 116 |
| 116 std::string ContentClient::GetCarbonInterposePath() const { | 117 std::string ContentClient::GetCarbonInterposePath() const { |
| 117 return std::string(); | 118 return std::string(); |
| 118 } | 119 } |
| 119 #endif | 120 #endif |
| 120 | 121 |
| 121 } // namespace content | 122 } // namespace content |
| OLD | NEW |