| Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| index 4f3472f758f49a3dbccf851a8b2e9687faa9ea97..4a1c57fd30046cc54e7e0836e4d657886b17c833 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
|
| @@ -28,7 +28,6 @@
|
| #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
|
| #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
|
| #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
|
| -#import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
|
| #import "chrome/browser/ui/cocoa/info_bubble_view.h"
|
| #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
|
| #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
|
| @@ -36,13 +35,14 @@
|
| #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
|
| #include "chrome/browser/ui/cocoa/task_manager_mac.h"
|
| #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
|
| +#import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
|
| #include "chrome/browser/ui/page_info_bubble.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/pref_names.h"
|
| -#include "content/public/browser/notification_source.h"
|
| #include "content/public/browser/native_web_keyboard_event.h"
|
| #include "content/public/browser/notification_details.h"
|
| +#include "content/public/browser/notification_source.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "grit/chromium_strings.h"
|
| #include "grit/generated_resources.h"
|
| @@ -486,8 +486,8 @@ void BrowserWindowCocoa::ShowPageInfo(WebContents* web_contents,
|
| const GURL& url,
|
| const SSLStatus& ssl,
|
| bool show_history) {
|
| - browser::ShowPageInfoBubble(window(), web_contents, url, ssl, show_history,
|
| - browser_);
|
| + chrome::ShowPageInfoBubble(window(), web_contents, url, ssl, show_history,
|
| + browser_);
|
| }
|
|
|
| void BrowserWindowCocoa::ShowWebsiteSettings(
|
|
|