OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/website_settings/website_settings_bubble_contro
ller.h" | 5 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro
ller.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #import <AppKit/AppKit.h> | 9 #import <AppKit/AppKit.h> |
10 | 10 |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 | 360 |
361 bridge_.reset(bridge); | 361 bridge_.reset(bridge); |
362 bridge_->set_bubble_controller(self); | 362 bridge_->set_bubble_controller(self); |
363 } | 363 } |
364 return self; | 364 return self; |
365 } | 365 } |
366 | 366 |
367 - (void)windowWillClose:(NSNotification*)notification { | 367 - (void)windowWillClose:(NSNotification*)notification { |
368 if (presenter_.get()) | 368 if (presenter_.get()) |
369 presenter_->OnUIClosing(); | 369 presenter_->OnUIClosing(); |
| 370 presenter_.reset(); |
370 [super windowWillClose:notification]; | 371 [super windowWillClose:notification]; |
371 } | 372 } |
372 | 373 |
373 - (void)setPresenter:(WebsiteSettings*)presenter { | 374 - (void)setPresenter:(WebsiteSettings*)presenter { |
374 presenter_.reset(presenter); | 375 presenter_.reset(presenter); |
375 } | 376 } |
376 | 377 |
377 // Create the subviews for the bubble for internal Chrome pages. | 378 // Create the subviews for the bubble for internal Chrome pages. |
378 - (void)initializeContentsForInternalPage { | 379 - (void)initializeContentsForInternalPage { |
379 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 380 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1287 [bubble_controller_ setPermissionInfo:permission_info_list]; | 1288 [bubble_controller_ setPermissionInfo:permission_info_list]; |
1288 } | 1289 } |
1289 | 1290 |
1290 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) { | 1291 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) { |
1291 [bubble_controller_ setFirstVisit:first_visit]; | 1292 [bubble_controller_ setFirstVisit:first_visit]; |
1292 } | 1293 } |
1293 | 1294 |
1294 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { | 1295 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { |
1295 [bubble_controller_ setSelectedTab:tab_id]; | 1296 [bubble_controller_ setSelectedTab:tab_id]; |
1296 } | 1297 } |
OLD | NEW |