summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main_gtk.cc
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 20:47:40 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 20:47:40 +0000
commit36d772caff4517f3dc536f582816ac786508e2cb (patch)
tree97c04d0eb3e3d205ef980686ebb8300a2596e725 /chrome/browser/browser_main_gtk.cc
parent7fea8ad60431ed71df2a087b131e4a5cde2b6755 (diff)
downloadchromium_src-36d772caff4517f3dc536f582816ac786508e2cb.zip
chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.gz
chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.bz2
Revert r92730, r92731, r92732 ... will land again once I ensure the win builds compile.
TBR=jam@chromium.org BUG=none TEST= Review URL: http://codereview.chromium.org/7400002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_gtk.cc')
-rw-r--r--chrome/browser/browser_main_gtk.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_main_gtk.cc b/chrome/browser/browser_main_gtk.cc
index 98480e0..3701a57 100644
--- a/chrome/browser/browser_main_gtk.cc
+++ b/chrome/browser/browser_main_gtk.cc
@@ -15,9 +15,9 @@
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_result_codes.h"
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
#include "content/browser/zygote_host_linux.h"
+#include "content/common/result_codes.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -186,7 +186,7 @@ void RecordBrowserStartupTime() {
// From browser_main_win.h, stubs until we figure out the right thing...
int DoUninstallTasks(bool chrome_still_running) {
- return content::RESULT_CODE_NORMAL_EXIT;
+ return ResultCodes::NORMAL_EXIT;
}
int HandleIconsCommands(const CommandLine &parsed_command_line) {