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

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

Issue 140613002: Cleanup: Replace &LazyInstance::Get() with LazyInstance::Pointer(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | « no previous file | chrome/browser/chromeos/extensions/input_method_api.cc » ('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/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 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 crash_keys::SetSwitchesFromCommandLine(command_line); 828 crash_keys::SetSwitchesFromCommandLine(command_line);
829 } 829 }
830 830
831 #endif // OS_MACOSX 831 #endif // OS_MACOSX
832 832
833 content::ContentBrowserClient* 833 content::ContentBrowserClient*
834 ChromeMainDelegate::CreateContentBrowserClient() { 834 ChromeMainDelegate::CreateContentBrowserClient() {
835 #if defined(CHROME_MULTIPLE_DLL_CHILD) 835 #if defined(CHROME_MULTIPLE_DLL_CHILD)
836 return NULL; 836 return NULL;
837 #else 837 #else
838 return &g_chrome_content_browser_client.Get(); 838 return g_chrome_content_browser_client.Pointer();
839 #endif 839 #endif
840 } 840 }
841 841
842 content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() { 842 content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() {
843 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 843 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
844 return NULL; 844 return NULL;
845 #else 845 #else
846 return &g_chrome_content_plugin_client.Get(); 846 return g_chrome_content_plugin_client.Pointer();
847 #endif 847 #endif
848 } 848 }
849 849
850 content::ContentRendererClient* 850 content::ContentRendererClient*
851 ChromeMainDelegate::CreateContentRendererClient() { 851 ChromeMainDelegate::CreateContentRendererClient() {
852 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 852 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
853 return NULL; 853 return NULL;
854 #else 854 #else
855 return &g_chrome_content_renderer_client.Get(); 855 return g_chrome_content_renderer_client.Pointer();
856 #endif 856 #endif
857 } 857 }
858 858
859 content::ContentUtilityClient* 859 content::ContentUtilityClient*
860 ChromeMainDelegate::CreateContentUtilityClient() { 860 ChromeMainDelegate::CreateContentUtilityClient() {
861 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 861 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
862 return NULL; 862 return NULL;
863 #else 863 #else
864 return &g_chrome_content_utility_client.Get(); 864 return g_chrome_content_utility_client.Pointer();
865 #endif 865 #endif
866 } 866 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/input_method_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698