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

Side by Side Diff: content/app/content_main_runner.cc

Issue 2845523003: Removes duplicate ui::RegisterPathProvider() (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | services/service_manager/embedder/main.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 "content/public/app/content_main_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 10
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 // TODO(evanm): move this to some shared subprocess-init function. 596 // TODO(evanm): move this to some shared subprocess-init function.
597 if (!base::debug::BeingDebugged()) 597 if (!base::debug::BeingDebugged())
598 signal(SIGINT, SIG_IGN); 598 signal(SIGINT, SIG_IGN);
599 } 599 }
600 #endif 600 #endif
601 601
602 #if defined(USE_NSS_CERTS) 602 #if defined(USE_NSS_CERTS)
603 crypto::EarlySetupForNSSInit(); 603 crypto::EarlySetupForNSSInit();
604 #endif 604 #endif
605 605
606 ui::RegisterPathProvider();
607 RegisterPathProvider(); 606 RegisterPathProvider();
608 RegisterContentSchemes(true); 607 RegisterContentSchemes(true);
609 608
610 #if defined(OS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE) 609 #if defined(OS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
611 int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor); 610 int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor);
612 if (icudata_fd != -1) { 611 if (icudata_fd != -1) {
613 auto icudata_region = g_fds->GetRegion(kAndroidICUDataDescriptor); 612 auto icudata_region = g_fds->GetRegion(kAndroidICUDataDescriptor);
614 CHECK(base::i18n::InitializeICUWithFileDescriptor(icudata_fd, 613 CHECK(base::i18n::InitializeICUWithFileDescriptor(icudata_fd,
615 icudata_region)); 614 icudata_region));
616 } else { 615 } else {
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 759
761 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 760 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
762 }; 761 };
763 762
764 // static 763 // static
765 ContentMainRunner* ContentMainRunner::Create() { 764 ContentMainRunner* ContentMainRunner::Create() {
766 return new ContentMainRunnerImpl(); 765 return new ContentMainRunnerImpl();
767 } 766 }
768 767
769 } // namespace content 768 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | services/service_manager/embedder/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698