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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 24544004: Remove the chrome namespace around ChromeContent[Renderer]Client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month 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
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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #if defined(OS_POSIX) && !defined(OS_MACOSX) 100 #if defined(OS_POSIX) && !defined(OS_MACOSX)
101 #include "components/breakpad/app/breakpad_linux.h" 101 #include "components/breakpad/app/breakpad_linux.h"
102 #endif 102 #endif
103 103
104 #if !defined(CHROME_MULTIPLE_DLL_CHILD) 104 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
105 base::LazyInstance<chrome::ChromeContentBrowserClient> 105 base::LazyInstance<chrome::ChromeContentBrowserClient>
106 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; 106 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
107 #endif 107 #endif
108 108
109 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 109 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
110 base::LazyInstance<chrome::ChromeContentRendererClient> 110 base::LazyInstance<ChromeContentRendererClient>
111 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; 111 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
112 base::LazyInstance<chrome::ChromeContentUtilityClient> 112 base::LazyInstance<chrome::ChromeContentUtilityClient>
113 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; 113 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
114 base::LazyInstance<chrome::ChromeContentPluginClient> 114 base::LazyInstance<chrome::ChromeContentPluginClient>
115 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; 115 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
116 #endif 116 #endif
117 117
118 #if defined(OS_POSIX) 118 #if defined(OS_POSIX)
119 base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky 119 base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
120 g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; 120 g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 } 852 }
853 853
854 content::ContentUtilityClient* 854 content::ContentUtilityClient*
855 ChromeMainDelegate::CreateContentUtilityClient() { 855 ChromeMainDelegate::CreateContentUtilityClient() {
856 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 856 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
857 return NULL; 857 return NULL;
858 #else 858 #else
859 return &g_chrome_content_utility_client.Get(); 859 return &g_chrome_content_utility_client.Get();
860 #endif 860 #endif
861 } 861 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | chrome/browser/content_settings/content_settings_internal_extension_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698