summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/global_error.cc
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 21:46:59 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 21:46:59 +0000
commitb3f2070a2cdaeb34250c7c80741a8ca6f42b990b (patch)
treee0ce68b07c146847bf92555e9c4216e8e51cee51 /chrome/browser/ui/global_error.cc
parentb5f778ea06d5df7b3847b0547d36557163d68ecf (diff)
downloadchromium_src-b3f2070a2cdaeb34250c7c80741a8ca6f42b990b.zip
chromium_src-b3f2070a2cdaeb34250c7c80741a8ca6f42b990b.tar.gz
chromium_src-b3f2070a2cdaeb34250c7c80741a8ca6f42b990b.tar.bz2
Add global error bubble view for Views
This change adds a bubble view to show global errors on toolkit Views. Tests comming in a separate CL. BUG=95146 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=100588 Review URL: http://codereview.chromium.org/7859025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/global_error.cc')
-rw-r--r--chrome/browser/ui/global_error.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/global_error.cc b/chrome/browser/ui/global_error.cc
index 3e01571..deff7cb 100644
--- a/chrome/browser/ui/global_error.cc
+++ b/chrome/browser/ui/global_error.cc
@@ -30,7 +30,7 @@ int GlobalError::GetBubbleViewIconResourceID() {
return IDR_INPUT_ALERT;
}
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(TOOLKIT_VIEWS)
// static
void GlobalError::ShowBubbleView(Browser* browser, GlobalError* error) {
NOTREACHED();