Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5198)

Unified Diff: chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm

Issue 2754383004: Rename WebsiteSettings code to PageInfo. (Closed)
Patch Set: Upload missing comment fix for WebSettingsUI -> PageInfoUI. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
index bb71b28d4adf1e5a6b6041ca672f389cf5fec65d..a5e6686638c3ea2c75d4d109f74539f3395c96c0 100644
--- a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
@@ -23,9 +23,9 @@
#import "chrome/browser/ui/cocoa/info_bubble_window.h"
#import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+#include "chrome/browser/ui/cocoa/page_info/page_info_utils_cocoa.h"
#include "chrome/browser/ui/cocoa/page_info/permission_selector_button.h"
#include "chrome/browser/ui/cocoa/page_info/split_block_button.h"
-#include "chrome/browser/ui/cocoa/page_info/website_settings_utils_cocoa.h"
#include "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
@@ -109,12 +109,11 @@ const NSInteger kFullscreenLeftOffset = 40;
__block PermissionPrompt::Delegate* blockDelegate = delegate;
__block AllowBlockMenuButton* blockSelf = self;
PermissionMenuModel::ChangeCallback changeCallback =
- base::BindBlock(^(const WebsiteSettingsUI::PermissionInfo& permission) {
- blockDelegate->ToggleAccept(
- index, permission.setting == CONTENT_SETTING_ALLOW);
- [blockSelf setFrameSize:
- SizeForWebsiteSettingsButtonTitle(blockSelf,
- [blockSelf title])];
+ base::BindBlock(^(const PageInfoUI::PermissionInfo& permission) {
+ blockDelegate->ToggleAccept(
+ index, permission.setting == CONTENT_SETTING_ALLOW);
+ [blockSelf setFrameSize:SizeForPageInfoButtonTitle(
+ blockSelf, [blockSelf title])];
});
menuModel_.reset(
@@ -128,7 +127,7 @@ const NSInteger kFullscreenLeftOffset = 40;
// Adjust the size to fit the current title. Using only -sizeToFit leaves
// an ugly amount of whitespace between the title and the arrows because it
// will fit to the largest element in the menu, not just the selected item.
- [self setFrameSize:SizeForWebsiteSettingsButtonTitle(self, [self title])];
+ [self setFrameSize:SizeForPageInfoButtonTitle(self, [self title])];
}
return self;
}
@@ -136,7 +135,7 @@ const NSInteger kFullscreenLeftOffset = 40;
- (CGFloat)maximumTitleWidth {
CGFloat maxTitleWidth = 0;
for (NSMenuItem* item in [self itemArray]) {
- NSSize size = SizeForWebsiteSettingsButtonTitle(self, [item title]);
+ NSSize size = SizeForPageInfoButtonTitle(self, [item title]);
maxTitleWidth = std::max(maxTitleWidth, size.width);
}
return maxTitleWidth;
« no previous file with comments | « chrome/browser/ui/cocoa/page_info/website_settings_utils_cocoa.mm ('k') | chrome/browser/ui/login/login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698