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

Side by Side Diff: content/public/app/content_main_delegate.cc

Issue 551103002: Work on "gn check" of content/* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years, 3 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
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 "content/public/app/content_main_delegate.h" 5 #include "content/public/app/content_main_delegate.h"
6 6
7 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
7 #include "content/public/browser/content_browser_client.h" 8 #include "content/public/browser/content_browser_client.h"
9 #endif
8 10
9 #if !defined(OS_IOS) 11 #if !defined(OS_IOS)
10 #include "content/public/plugin/content_plugin_client.h" 12 #include "content/public/plugin/content_plugin_client.h"
11 #include "content/public/renderer/content_renderer_client.h" 13 #include "content/public/renderer/content_renderer_client.h"
12 #include "content/public/utility/content_utility_client.h" 14 #include "content/public/utility/content_utility_client.h"
13 #endif 15 #endif
14 16
15 namespace content { 17 namespace content {
16 18
17 bool ContentMainDelegate::BasicStartupComplete(int* exit_code) { 19 bool ContentMainDelegate::BasicStartupComplete(int* exit_code) {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 80
79 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { 81 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
80 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) 82 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
81 return NULL; 83 return NULL;
82 #else 84 #else
83 return new ContentUtilityClient(); 85 return new ContentUtilityClient();
84 #endif 86 #endif
85 } 87 }
86 88
87 } // namespace content 89 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698