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

Side by Side Diff: chrome/browser/chrome_browser_main_android.cc

Issue 18770006: Remove USE_LINUX_BREAKPAD ifdef since we don't need it for chromium anymore. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: android build fix per cjhopman Created 7 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
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/browser/chrome_browser_main_android.h" 5 #include "chrome/browser/chrome_browser_main_android.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "cc/base/switches.h" 10 #include "cc/base/switches.h"
(...skipping 10 matching lines...) Expand all
21 ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid( 21 ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid(
22 const content::MainFunctionParams& parameters) 22 const content::MainFunctionParams& parameters)
23 : ChromeBrowserMainParts(parameters) { 23 : ChromeBrowserMainParts(parameters) {
24 } 24 }
25 25
26 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() { 26 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() {
27 } 27 }
28 28
29 void ChromeBrowserMainPartsAndroid::PreProfileInit() { 29 void ChromeBrowserMainPartsAndroid::PreProfileInit() {
30 TRACE_EVENT0("startup", "ChromeBrowserMainPartsAndroid::PreProfileInit") 30 TRACE_EVENT0("startup", "ChromeBrowserMainPartsAndroid::PreProfileInit")
31 #if defined(USE_LINUX_BREAKPAD)
32 #if defined(GOOGLE_CHROME_BUILD) 31 #if defined(GOOGLE_CHROME_BUILD)
33 // TODO(jcivelli): we should not initialize the crash-reporter when it was not 32 // TODO(jcivelli): we should not initialize the crash-reporter when it was not
34 // enabled. Right now if it is disabled we still generate the minidumps but we 33 // enabled. Right now if it is disabled we still generate the minidumps but we
35 // do not upload them. 34 // do not upload them.
36 bool breakpad_enabled = true; 35 bool breakpad_enabled = true;
37 #else 36 #else
38 bool breakpad_enabled = false; 37 bool breakpad_enabled = false;
39 #endif 38 #endif
40 39
41 // Allow Breakpad to be enabled in Chromium builds for testing purposes. 40 // Allow Breakpad to be enabled in Chromium builds for testing purposes.
42 if (!breakpad_enabled) 41 if (!breakpad_enabled)
43 breakpad_enabled = CommandLine::ForCurrentProcess()->HasSwitch( 42 breakpad_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
44 switches::kEnableCrashReporterForTesting); 43 switches::kEnableCrashReporterForTesting);
45 44
46 if (breakpad_enabled) { 45 if (breakpad_enabled) {
47 InitCrashReporter(); 46 InitCrashReporter();
48 crash_dump_manager_.reset(new CrashDumpManager()); 47 crash_dump_manager_.reset(new CrashDumpManager());
49 } 48 }
50 #endif
51 49
52 ChromeBrowserMainParts::PreProfileInit(); 50 ChromeBrowserMainParts::PreProfileInit();
53 } 51 }
54 52
55 void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() { 53 void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() {
56 TRACE_EVENT0("startup", 54 TRACE_EVENT0("startup",
57 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization") 55 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization")
58 net::NetworkChangeNotifier::SetFactory( 56 net::NetworkChangeNotifier::SetFactory(
59 new net::NetworkChangeNotifierFactoryAndroid()); 57 new net::NetworkChangeNotifierFactoryAndroid());
60 58
(...skipping 19 matching lines...) Expand all
80 78
81 CommandLine::ForCurrentProcess()->AppendSwitch( 79 CommandLine::ForCurrentProcess()->AppendSwitch(
82 cc::switches::kCompositeToMailbox); 80 cc::switches::kCompositeToMailbox);
83 81
84 ChromeBrowserMainParts::PreEarlyInitialization(); 82 ChromeBrowserMainParts::PreEarlyInitialization();
85 } 83 }
86 84
87 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { 85 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
88 NOTREACHED(); 86 NOTREACHED();
89 } 87 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698