summaryrefslogtreecommitdiffstats
path: root/chrome/browser/first_run
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:21:18 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:21:18 +0000
commitc1aede0b5089e4616804c1aec1819b28c8cd6ac8 (patch)
tree07050fa5dffdcb6eb7d42ebbd2cbb450fc818f5b /chrome/browser/first_run
parent60aefa74d94c67a4ce2e8df6f4dd19d3851eab28 (diff)
downloadchromium_src-c1aede0b5089e4616804c1aec1819b28c8cd6ac8.zip
chromium_src-c1aede0b5089e4616804c1aec1819b28c8cd6ac8.tar.gz
chromium_src-c1aede0b5089e4616804c1aec1819b28c8cd6ac8.tar.bz2
Single deinlining in first_run.{cc,h}
(This used to break chrome_frame linking, but after rebasing, there doesn't seem to be any issue.) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5708004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
-rw-r--r--chrome/browser/first_run/first_run.cc14
-rw-r--r--chrome/browser/first_run/first_run.h12
2 files changed, 18 insertions, 8 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index f239fa5..874cebb 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -472,6 +472,20 @@ void Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
}
#endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+FirstRunBrowserProcess::FirstRunBrowserProcess(const CommandLine& command_line)
+ : BrowserProcessImpl(command_line) {
+}
+
+FirstRunBrowserProcess::~FirstRunBrowserProcess() {}
+
+GoogleURLTracker* FirstRunBrowserProcess::google_url_tracker() {
+ return NULL;
+}
+
+IntranetRedirectDetector* FirstRunBrowserProcess::intranet_redirect_detector() {
+ return NULL;
+}
+
FirstRunImportObserver::FirstRunImportObserver()
: loop_running_(false), import_result_(ResultCodes::NORMAL_EXIT) {
}
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index c131756..415753f 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -282,15 +282,11 @@ class Upgrade {
// thread to fetch on).
class FirstRunBrowserProcess : public BrowserProcessImpl {
public:
- explicit FirstRunBrowserProcess(const CommandLine& command_line)
- : BrowserProcessImpl(command_line) {
- }
- virtual ~FirstRunBrowserProcess() { }
+ explicit FirstRunBrowserProcess(const CommandLine& command_line);
+ virtual ~FirstRunBrowserProcess();
- virtual GoogleURLTracker* google_url_tracker() { return NULL; }
- virtual IntranetRedirectDetector* intranet_redirect_detector() {
- return NULL;
- }
+ virtual GoogleURLTracker* google_url_tracker();
+ virtual IntranetRedirectDetector* intranet_redirect_detector();
private:
DISALLOW_COPY_AND_ASSIGN(FirstRunBrowserProcess);