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

Unified Diff: chrome/browser/cocoa/content_settings_dialog_controller.mm

Issue 2932009: Mac: Tweak content settings window. (Closed)
Patch Set: fffffffffffffffff Created 10 years, 5 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/cocoa/content_settings_dialog_controller.mm
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm
index 9402084fba54bd4a4caff275899d526d8cbf0c33..631e9272641d21ce4a43d03cd0dabb409f03cb0b 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm
@@ -14,6 +14,7 @@
#import "chrome/browser/cocoa/cookies_window_controller.h"
#import "chrome/browser/cocoa/simple_content_exceptions_window_controller.h"
#import "chrome/browser/cocoa/l10n_util.h"
+#import "chrome/browser/cocoa/tab_view_picker_table.h"
#import "chrome/browser/geolocation/geolocation_content_settings_map.h"
#import "chrome/browser/geolocation/geolocation_exceptions_table_model.h"
#import "chrome/browser/host_content_settings_map.h"
@@ -25,6 +26,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "grit/locale_settings.h"
+#include "grit/generated_resources.h"
namespace {
@@ -168,6 +170,8 @@ class PrefObserverDisabler {
- (void)awakeFromNib {
DCHECK([self window]);
+ DCHECK(tabView_);
+ DCHECK(tabViewPicker_);
DCHECK_EQ(self, [[self window] delegate]);
// Adapt views to potentially long localized strings.
@@ -186,6 +190,11 @@ class PrefObserverDisabler {
}
}
+ NSString* label =
+ l10n_util::GetNSStringWithFixup(IDS_CONTENT_SETTINGS_FEATURES_LABEL);
+ label = [label stringByReplacingOccurrencesOfString:@":" withString:@""];
+ [tabViewPicker_ setHeading:label];
+
NSRect frame = [[self window] frame];
frame.origin.y -= windowDelta;
frame.size.height += windowDelta;
« no previous file with comments | « chrome/browser/cocoa/content_settings_dialog_controller.h ('k') | chrome/browser/cocoa/tab_view_picker_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698