summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 03:00:46 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 03:00:46 +0000
commitcb69b128dddf0cd36076913f192e0592f08a366b (patch)
treef0720c4729fa39b14676ab03e92ca29f0412e85e
parente87ff0df1891c01dc5845fa93c42947a96fd1b1a (diff)
downloadchromium_src-cb69b128dddf0cd36076913f192e0592f08a366b.zip
chromium_src-cb69b128dddf0cd36076913f192e0592f08a366b.tar.gz
chromium_src-cb69b128dddf0cd36076913f192e0592f08a366b.tar.bz2
Reenables showing crashed info bar on chrome os.
BUG=23502 TEST=none Review URL: http://codereview.chromium.org/249050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27698 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_init.cc3
-rw-r--r--chrome/browser/defaults.cc2
-rw-r--r--chrome/browser/defaults.h3
3 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 929c27a..b551bcf 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -563,8 +563,7 @@ Browser* BrowserInit::LaunchWithProfile::OpenURLsInBrowser(
urls[i], GURL(), PageTransition::START_PAGE, (i == 0), -1, false, NULL);
if (i < static_cast<size_t>(pin_count))
browser->tabstrip_model()->SetTabPinned(browser->tab_count() - 1, true);
- if (profile_ && i == 0 &&
- process_startup && !browser_defaults::kSuppressCrashInfoBar)
+ if (profile_ && i == 0 && process_startup)
AddCrashedInfoBarIfNecessary(tab);
}
browser->window()->Show();
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 4c7a7c2..098c6b9 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -14,7 +14,6 @@ const double kAutocompleteEditFontPixelSizeInPopup = kAutocompletePopupFontSize;
const int kAutocompletePopupFontSize = 7;
const SessionStartupPref::Type kDefaultSessionStartupType =
SessionStartupPref::LAST;
-const bool kSuppressCrashInfoBar = true;
const int kPinnedTabWidth = 64;
const bool kCanToggleSystemTitleBar = false;
@@ -42,7 +41,6 @@ const bool kCanToggleSystemTitleBar = true;
const SessionStartupPref::Type kDefaultSessionStartupType =
SessionStartupPref::DEFAULT;
-const bool kSuppressCrashInfoBar = false;
const int kPinnedTabWidth = 56;
#endif
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index 245c4c9..814a616 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -31,9 +31,6 @@ extern const bool kCanToggleSystemTitleBar;
// The default value for session startup.
extern const SessionStartupPref::Type kDefaultSessionStartupType;
-// On launching Chrome should we show the crash info bar if Chrome crashed?
-extern const bool kSuppressCrashInfoBar;
-
// Width of pinned tabs.
extern const int kPinnedTabWidth;