| 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 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h" | 5 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/search_engines/util.h" | 10 #include "chrome/browser/search_engines/util.h" |
| 11 #import "chrome/browser/ui/browser.h" | 11 #import "chrome/browser/ui/browser.h" |
| 12 #import "chrome/browser/ui/browser_window.h" | 12 #import "chrome/browser/ui/browser_window.h" |
| 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 13 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 14 #import "chrome/browser/ui/cocoa/l10n_util.h" | 14 #import "chrome/browser/ui/cocoa/l10n_util.h" |
| 15 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 15 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| 16 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 16 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 17 #include "chrome/browser/ui/global_error.h" | 17 #include "chrome/browser/ui/global_error/global_error.h" |
| 18 #include "chrome/browser/ui/global_error_bubble_view_base.h" | 18 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" |
| 19 #include "chrome/browser/ui/global_error_service.h" | 19 #include "chrome/browser/ui/global_error/global_error_service.h" |
| 20 #include "chrome/browser/ui/global_error_service_factory.h" | 20 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 22 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" | 22 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.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/gfx/image/image.h" | 25 #include "ui/gfx/image/image.h" |
| 26 | 26 |
| 27 namespace { | 27 namespace { |
| 28 | 28 |
| 29 // The vertical offset of the wrench bubble from the wrench menu button. | 29 // The vertical offset of the wrench bubble from the wrench menu button. |
| 30 const CGFloat kWrenchBubblePointOffsetY = 6; | 30 const CGFloat kWrenchBubblePointOffsetY = 6; |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 [self close]; | 142 [self close]; |
| 143 } | 143 } |
| 144 | 144 |
| 145 @end | 145 @end |
| 146 | 146 |
| 147 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowBubbleView( | 147 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowBubbleView( |
| 148 Browser* browser, | 148 Browser* browser, |
| 149 const base::WeakPtr<GlobalError>& error) { | 149 const base::WeakPtr<GlobalError>& error) { |
| 150 return [GlobalErrorBubbleController showForBrowser:browser error:error]; | 150 return [GlobalErrorBubbleController showForBrowser:browser error:error]; |
| 151 } | 151 } |
| OLD | NEW |