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

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

Issue 7377010: This change will split the result codes between content and chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: actually rename the files Created 9 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) 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 "chrome/browser/browser_main_gtk.h" 5 #include "chrome/browser/browser_main_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/debug/debugger.h" 13 #include "base/debug/debugger.h"
14 #include "chrome/browser/browser_main_win.h" 14 #include "chrome/browser/browser_main_win.h"
15 #include "chrome/browser/metrics/metrics_service.h" 15 #include "chrome/browser/metrics/metrics_service.h"
16 #include "chrome/browser/ui/browser_list.h" 16 #include "chrome/browser/ui/browser_list.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/chrome_result_codes.h"
18 #include "content/browser/renderer_host/render_sandbox_host_linux.h" 19 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
19 #include "content/browser/zygote_host_linux.h" 20 #include "content/browser/zygote_host_linux.h"
20 #include "content/common/result_codes.h"
21 #include "grit/chromium_strings.h" 21 #include "grit/chromium_strings.h"
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
25 #include "ui/base/x/x11_util.h" 25 #include "ui/base/x/x11_util.h"
26 #include "ui/base/x/x11_util_internal.h" 26 #include "ui/base/x/x11_util_internal.h"
27 #include "ui/gfx/gtk_util.h" 27 #include "ui/gfx/gtk_util.h"
28 28
29 #if defined(USE_NSS) 29 #if defined(USE_NSS)
30 #include "crypto/nss_util.h" 30 #include "crypto/nss_util.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // Nothing to warn about on GTK right now. 179 // Nothing to warn about on GTK right now.
180 } 180 }
181 181
182 void RecordBrowserStartupTime() { 182 void RecordBrowserStartupTime() {
183 // Not implemented on GTK for now. 183 // Not implemented on GTK for now.
184 } 184 }
185 185
186 // From browser_main_win.h, stubs until we figure out the right thing... 186 // From browser_main_win.h, stubs until we figure out the right thing...
187 187
188 int DoUninstallTasks(bool chrome_still_running) { 188 int DoUninstallTasks(bool chrome_still_running) {
189 return ResultCodes::NORMAL_EXIT; 189 return content::RESULT_CODE_NORMAL_EXIT;
190 } 190 }
191 191
192 int HandleIconsCommands(const CommandLine &parsed_command_line) { 192 int HandleIconsCommands(const CommandLine &parsed_command_line) {
193 return 0; 193 return 0;
194 } 194 }
195 195
196 bool CheckMachineLevelInstall() { 196 bool CheckMachineLevelInstall() {
197 return false; 197 return false;
198 } 198 }
199 199
200 void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) { 200 void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) {
201 } 201 }
202 202
203 void SetBrowserX11ErrorHandlers() { 203 void SetBrowserX11ErrorHandlers() {
204 // Set up error handlers to make sure profile gets written if X server 204 // Set up error handlers to make sure profile gets written if X server
205 // goes away. 205 // goes away.
206 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); 206 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
207 } 207 }
208 208
209 #if !defined(OS_CHROMEOS) 209 #if !defined(OS_CHROMEOS)
210 // static 210 // static
211 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( 211 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
212 const MainFunctionParams& parameters) { 212 const MainFunctionParams& parameters) {
213 return new BrowserMainPartsGtk(parameters); 213 return new BrowserMainPartsGtk(parameters);
214 } 214 }
215 #endif 215 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698