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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 15702003: Move webkit/user_agent/ into webkit/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/common/chrome_content_client_ios.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/cpu.h" 8 #include "base/cpu.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 15 matching lines...) Expand all
26 #include "content/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
27 #include "content/public/common/pepper_plugin_info.h" 27 #include "content/public/common/pepper_plugin_info.h"
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "extensions/common/constants.h" 29 #include "extensions/common/constants.h"
30 #include "grit/common_resources.h" 30 #include "grit/common_resources.h"
31 #include "ppapi/shared_impl/ppapi_permissions.h" 31 #include "ppapi/shared_impl/ppapi_permissions.h"
32 #include "remoting/client/plugin/pepper_entrypoints.h" 32 #include "remoting/client/plugin/pepper_entrypoints.h"
33 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/layout.h" 34 #include "ui/base/layout.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "webkit/common/user_agent/user_agent_util.h"
36 #include "webkit/plugins/npapi/plugin_list.h" 37 #include "webkit/plugins/npapi/plugin_list.h"
37 #include "webkit/plugins/plugin_constants.h" 38 #include "webkit/plugins/plugin_constants.h"
38 #include "webkit/plugins/plugin_switches.h" 39 #include "webkit/plugins/plugin_switches.h"
39 #include "webkit/user_agent/user_agent_util.h"
40 40
41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "base/win/registry.h" 45 #include "base/win/registry.h"
46 #include "base/win/windows_version.h" 46 #include "base/win/windows_version.h"
47 #include "sandbox/win/src/sandbox.h" 47 #include "sandbox/win/src/sandbox.h"
48 #elif defined(OS_MACOSX) 48 #elif defined(OS_MACOSX)
49 #include "chrome/common/chrome_sandbox_type_mac.h" 49 #include "chrome/common/chrome_sandbox_type_mac.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 } 481 }
482 return false; 482 return false;
483 } 483 }
484 484
485 std::string ChromeContentClient::GetCarbonInterposePath() const { 485 std::string ChromeContentClient::GetCarbonInterposePath() const {
486 return std::string(kInterposeLibraryPath); 486 return std::string(kInterposeLibraryPath);
487 } 487 }
488 #endif 488 #endif
489 489
490 } // namespace chrome 490 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/common/chrome_content_client_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698