| 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/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "chrome/browser/search_engines/util.h" | |
| 13 #import "chrome/browser/ui/browser.h" | 12 #import "chrome/browser/ui/browser.h" |
| 14 #import "chrome/browser/ui/browser_window.h" | 13 #import "chrome/browser/ui/browser_window.h" |
| 15 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 14 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 16 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 15 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
| 17 #import "chrome/browser/ui/cocoa/l10n_util.h" | 16 #import "chrome/browser/ui/cocoa/l10n_util.h" |
| 18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 17 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
| 19 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" | 18 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" |
| 20 #include "chrome/browser/ui/global_error/global_error.h" | 19 #include "chrome/browser/ui/global_error/global_error.h" |
| 21 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" | 20 #include "chrome/browser/ui/global_error/global_error_bubble_view_base.h" |
| 22 #include "chrome/browser/ui/global_error/global_error_service.h" | 21 #include "chrome/browser/ui/global_error/global_error_service.h" |
| 23 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 22 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 23 #include "components/search_engines/util.h" |
| 24 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
| 25 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw
eaker.h" | 25 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw
eaker.h" |
| 26 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
| 27 #include "ui/gfx/image/image.h" | 27 #include "ui/gfx/image/image.h" |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 const CGFloat kParagraphSpacing = 6; | 30 const CGFloat kParagraphSpacing = 6; |
| 31 } // namespace | 31 } // namespace |
| 32 | 32 |
| 33 namespace GlobalErrorBubbleControllerInternal { | 33 namespace GlobalErrorBubbleControllerInternal { |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 [self close]; | 156 [self close]; |
| 157 } | 157 } |
| 158 | 158 |
| 159 @end | 159 @end |
| 160 | 160 |
| 161 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView( | 161 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView( |
| 162 Browser* browser, | 162 Browser* browser, |
| 163 const base::WeakPtr<GlobalErrorWithStandardBubble>& error) { | 163 const base::WeakPtr<GlobalErrorWithStandardBubble>& error) { |
| 164 return [GlobalErrorBubbleController showForBrowser:browser error:error]; | 164 return [GlobalErrorBubbleController showForBrowser:browser error:error]; |
| 165 } | 165 } |
| OLD | NEW |