| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/global_error/global_error.h" | 5 #include "chrome/browser/ui/global_error/global_error.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" | 8 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" |
| 9 #include "grit/theme_resources.h" | 9 #include "grit/theme_resources.h" |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #else | 38 #else |
| 39 bubble_view_ = | 39 bubble_view_ = |
| 40 GlobalErrorBubbleViewBase::ShowBubbleView(browser, AsWeakPtr()); | 40 GlobalErrorBubbleViewBase::ShowBubbleView(browser, AsWeakPtr()); |
| 41 #endif | 41 #endif |
| 42 } | 42 } |
| 43 | 43 |
| 44 GlobalErrorBubbleViewBase* GlobalError::GetBubbleView() { | 44 GlobalErrorBubbleViewBase* GlobalError::GetBubbleView() { |
| 45 return bubble_view_; | 45 return bubble_view_; |
| 46 } | 46 } |
| 47 | 47 |
| 48 int GlobalError::GetBubbleViewIconResourceID() { | |
| 49 // If you change this make sure to also change the menu icon and the wrench | |
| 50 // icon color. | |
| 51 return IDR_INPUT_ALERT; | |
| 52 } | |
| 53 | |
| 54 void GlobalError::BubbleViewDidClose(Browser* browser) { | 48 void GlobalError::BubbleViewDidClose(Browser* browser) { |
| 55 DCHECK(browser); | 49 DCHECK(browser); |
| 56 bubble_view_ = NULL; | 50 bubble_view_ = NULL; |
| 57 OnBubbleViewDidClose(browser); | 51 OnBubbleViewDidClose(browser); |
| 58 } | 52 } |
| OLD | NEW |