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

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

Issue 10532178: Rename back _linuxish to linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a typo Created 8 years, 5 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/app/breakpad_linuxish.cc ('k') | chrome/browser/chrome_browser_main_linux.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/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include <gtk/gtk.h> 80 #include <gtk/gtk.h>
81 #endif 81 #endif
82 82
83 #if defined(USE_X11) 83 #if defined(USE_X11)
84 #include <stdlib.h> 84 #include <stdlib.h>
85 #include <string.h> 85 #include <string.h>
86 #include "ui/base/x/x11_util.h" 86 #include "ui/base/x/x11_util.h"
87 #endif 87 #endif
88 88
89 #if defined(USE_LINUX_BREAKPAD) 89 #if defined(USE_LINUX_BREAKPAD)
90 #include "chrome/app/breakpad_linuxish.h" 90 #include "chrome/app/breakpad_linux.h"
91 #endif 91 #endif
92 92
93 base::LazyInstance<chrome::ChromeContentBrowserClient> 93 base::LazyInstance<chrome::ChromeContentBrowserClient>
94 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; 94 g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
95 base::LazyInstance<chrome::ChromeContentRendererClient> 95 base::LazyInstance<chrome::ChromeContentRendererClient>
96 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; 96 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
97 base::LazyInstance<chrome::ChromeContentUtilityClient> 97 base::LazyInstance<chrome::ChromeContentUtilityClient>
98 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; 98 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
99 base::LazyInstance<chrome::ChromeContentPluginClient> 99 base::LazyInstance<chrome::ChromeContentPluginClient>
100 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; 100 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 716
717 content::ContentRendererClient* 717 content::ContentRendererClient*
718 ChromeMainDelegate::CreateContentRendererClient() { 718 ChromeMainDelegate::CreateContentRendererClient() {
719 return &g_chrome_content_renderer_client.Get(); 719 return &g_chrome_content_renderer_client.Get();
720 } 720 }
721 721
722 content::ContentUtilityClient* 722 content::ContentUtilityClient*
723 ChromeMainDelegate::CreateContentUtilityClient() { 723 ChromeMainDelegate::CreateContentUtilityClient() {
724 return &g_chrome_content_utility_client.Get(); 724 return &g_chrome_content_utility_client.Get();
725 } 725 }
OLDNEW
« no previous file with comments | « chrome/app/breakpad_linuxish.cc ('k') | chrome/browser/chrome_browser_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698