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

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

Issue 5708004: Changes to FirstRunBrowserProcess that break chrome frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 10 years 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/browser/first_run/first_run.h ('k') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/first_run/first_run.h" 5 #include "chrome/browser/first_run/first_run.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 // TODO(port): move more code in back from the first_run_win.cc module. 9 // TODO(port): move more code in back from the first_run_win.cc module.
10 10
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 DLOG(ERROR) << "Launching a new instance of the browser failed."; 465 DLOG(ERROR) << "Launching a new instance of the browser failed.";
466 } else { 466 } else {
467 DLOG(WARNING) << "Launched a new instance of the browser."; 467 DLOG(WARNING) << "Launched a new instance of the browser.";
468 } 468 }
469 delete new_command_line_; 469 delete new_command_line_;
470 new_command_line_ = NULL; 470 new_command_line_ = NULL;
471 } 471 }
472 } 472 }
473 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 473 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
474 474
475 FirstRunBrowserProcess::FirstRunBrowserProcess(const CommandLine& command_line)
476 : BrowserProcessImpl(command_line) {
477 }
478
479 FirstRunBrowserProcess::~FirstRunBrowserProcess() {}
480
481 GoogleURLTracker* FirstRunBrowserProcess::google_url_tracker() {
482 return NULL;
483 }
484
485 IntranetRedirectDetector* FirstRunBrowserProcess::intranet_redirect_detector() {
486 return NULL;
487 }
488
475 FirstRunImportObserver::FirstRunImportObserver() 489 FirstRunImportObserver::FirstRunImportObserver()
476 : loop_running_(false), import_result_(ResultCodes::NORMAL_EXIT) { 490 : loop_running_(false), import_result_(ResultCodes::NORMAL_EXIT) {
477 } 491 }
478 492
479 int FirstRunImportObserver::import_result() const { 493 int FirstRunImportObserver::import_result() const {
480 return import_result_; 494 return import_result_;
481 } 495 }
482 496
483 void FirstRunImportObserver::ImportCanceled() { 497 void FirstRunImportObserver::ImportCanceled() {
484 import_result_ = ResultCodes::IMPORTER_CANCEL; 498 import_result_ = ResultCodes::IMPORTER_CANCEL;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 if (!observer->ended()) { 674 if (!observer->ended()) {
661 observer->set_should_quit_message_loop(); 675 observer->set_should_quit_message_loop();
662 MessageLoop::current()->Run(); 676 MessageLoop::current()->Run();
663 } 677 }
664 678
665 // Unfortunately there's no success/fail signal in ImporterHost. 679 // Unfortunately there's no success/fail signal in ImporterHost.
666 return true; 680 return true;
667 } 681 }
668 682
669 #endif // OS_POSIX 683 #endif // OS_POSIX
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698