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

Side by Side Diff: chrome/app/chrome_exe_main_gtk.cc

Issue 6835022: Broke ARM compile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/browser_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/process_util.h" 5 #include "base/process_util.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 7
8 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 8 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
9 #include "chrome/browser/first_run/upgrade_util.h" 9 #include "chrome/browser/first_run/upgrade.h"
10 #endif 10 #endif
11 11
12 // The entry point for all invocations of Chromium, browser and renderer. On 12 // The entry point for all invocations of Chromium, browser and renderer. On
13 // windows, this does nothing but load chrome.dll and invoke its entry point in 13 // windows, this does nothing but load chrome.dll and invoke its entry point in
14 // order to make it easy to update the app from GoogleUpdate. We don't need 14 // order to make it easy to update the app from GoogleUpdate. We don't need
15 // that extra layer with on linux. 15 // that extra layer with on linux.
16 // 16 //
17 // TODO(tc): This is similar to chrome_exe_main_mac.mm. After it's 17 // TODO(tc): This is similar to chrome_exe_main_mac.mm. After it's
18 // more clear what needs to go here, we should evaluate whether or not 18 // more clear what needs to go here, we should evaluate whether or not
19 // to merge this file with chrome_exe_main_mac.mm. 19 // to merge this file with chrome_exe_main_mac.mm.
(...skipping 24 matching lines...) Expand all
44 // The exit manager is in charge of calling the dtors of singletons. 44 // The exit manager is in charge of calling the dtors of singletons.
45 // Win has one here, but we assert with multiples from BrowserMain() if we 45 // Win has one here, but we assert with multiples from BrowserMain() if we
46 // keep it. 46 // keep it.
47 // base::AtExitManager exit_manager; 47 // base::AtExitManager exit_manager;
48 48
49 int return_code = ChromeMain(argc, argv); 49 int return_code = ChromeMain(argc, argv);
50 50
51 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 51 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
52 // Launch a new instance if we're shutting down because we detected an 52 // Launch a new instance if we're shutting down because we detected an
53 // upgrade in the persistent mode. 53 // upgrade in the persistent mode.
54 upgrade_util::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); 54 Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded();
55 #endif 55 #endif
56 56
57 return return_code; 57 return return_code;
58 } 58 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698