| Index: chrome/browser/ui/cocoa/browser_window_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| index 05f7da8fe435416cf6e32c56951cbcfd0d97c84a..7b549fa9ad13d10f3da7779ed4940531d6901282 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| @@ -70,14 +70,12 @@
|
| #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
|
| #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
|
| #import "chrome/browser/ui/cocoa/translate/translate_bubble_controller.h"
|
| -#include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
|
| #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
|
| #include "chrome/browser/ui/location_bar/location_bar.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
|
| #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
|
| #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
|
| -#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
|
| #include "chrome/browser/ui/window_sizer/window_sizer.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/command.h"
|
| @@ -1266,27 +1264,6 @@ using content::WebContents;
|
| [toolbarController_ setTranslateIconLit:on];
|
| }
|
|
|
| -- (void)onActiveTabChanged:(content::WebContents*)oldContents
|
| - to:(content::WebContents*)newContents {
|
| - // No need to remove previous bubble. It will close itself.
|
| - PermissionBubbleManager* manager(nullptr);
|
| - if (oldContents) {
|
| - manager = PermissionBubbleManager::FromWebContents(oldContents);
|
| - if (manager)
|
| - manager->SetView(nullptr);
|
| - }
|
| -
|
| - if (newContents) {
|
| - if (!permissionBubbleCocoa_.get()) {
|
| - DCHECK(browser_.get());
|
| - permissionBubbleCocoa_.reset(new PermissionBubbleCocoa(browser_.get()));
|
| - }
|
| - manager = PermissionBubbleManager::FromWebContents(newContents);
|
| - if (manager)
|
| - manager->SetView(permissionBubbleCocoa_.get());
|
| - }
|
| -}
|
| -
|
| - (void)zoomChangedForActiveTab:(BOOL)canShowBubble {
|
| [toolbarController_ zoomChangedForActiveTab:canShowBubble];
|
| }
|
|
|