diff options
16 files changed, 42 insertions, 42 deletions
diff --git a/chrome/app/nibs/ContentBlockedCookies.xib b/chrome/app/nibs/ContentBlockedCookies.xib index 63ff638..e43c0e5 100644 --- a/chrome/app/nibs/ContentBlockedCookies.xib +++ b/chrome/app/nibs/ContentBlockedCookies.xib @@ -26,7 +26,7 @@ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1001"> - <string key="NSClassName">ContentBlockedBubbleController</string> + <string key="NSClassName">ContentSettingBubbleController</string> </object> <object class="NSCustomObject" id="1003"> <string key="NSClassName">FirstResponder</string> @@ -599,7 +599,7 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">ContentBlockedBubbleController</string> + <string key="className">ContentSettingBubbleController</string> <string key="superclassName">BaseBubbleController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> diff --git a/chrome/app/nibs/ContentBlockedImages.xib b/chrome/app/nibs/ContentBlockedImages.xib index a1a4899b..6137152 100644 --- a/chrome/app/nibs/ContentBlockedImages.xib +++ b/chrome/app/nibs/ContentBlockedImages.xib @@ -26,7 +26,7 @@ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1001"> - <string key="NSClassName">ContentBlockedBubbleController</string> + <string key="NSClassName">ContentSettingBubbleController</string> </object> <object class="NSCustomObject" id="1003"> <string key="NSClassName">FirstResponder</string> @@ -763,7 +763,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">ContentBlockedBubbleController</string> + <string key="className">ContentSettingBubbleController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> diff --git a/chrome/app/nibs/ContentBlockedJavaScript.xib b/chrome/app/nibs/ContentBlockedJavaScript.xib index 6741853..acaf95b 100644 --- a/chrome/app/nibs/ContentBlockedJavaScript.xib +++ b/chrome/app/nibs/ContentBlockedJavaScript.xib @@ -26,7 +26,7 @@ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1001"> - <string key="NSClassName">ContentBlockedBubbleController</string> + <string key="NSClassName">ContentSettingBubbleController</string> </object> <object class="NSCustomObject" id="1003"> <string key="NSClassName">FirstResponder</string> @@ -763,7 +763,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">ContentBlockedBubbleController</string> + <string key="className">ContentSettingBubbleController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> diff --git a/chrome/app/nibs/ContentBlockedPlugins.xib b/chrome/app/nibs/ContentBlockedPlugins.xib index b2047fb..574dc74 100644 --- a/chrome/app/nibs/ContentBlockedPlugins.xib +++ b/chrome/app/nibs/ContentBlockedPlugins.xib @@ -26,7 +26,7 @@ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1001"> - <string key="NSClassName">ContentBlockedBubbleController</string> + <string key="NSClassName">ContentSettingBubbleController</string> </object> <object class="NSCustomObject" id="1003"> <string key="NSClassName">FirstResponder</string> @@ -849,7 +849,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">ContentBlockedBubbleController</string> + <string key="className">ContentSettingBubbleController</string> <string key="superclassName">BaseBubbleController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> diff --git a/chrome/app/nibs/ContentBlockedPopups.xib b/chrome/app/nibs/ContentBlockedPopups.xib index b5e1810..e94d41d 100644 --- a/chrome/app/nibs/ContentBlockedPopups.xib +++ b/chrome/app/nibs/ContentBlockedPopups.xib @@ -26,7 +26,7 @@ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1001"> - <string key="NSClassName">ContentBlockedBubbleController</string> + <string key="NSClassName">ContentSettingBubbleController</string> </object> <object class="NSCustomObject" id="1003"> <string key="NSClassName">FirstResponder</string> @@ -763,7 +763,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">ContentBlockedBubbleController</string> + <string key="className">ContentSettingBubbleController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> diff --git a/chrome/app/nibs/ContentBubbleGeolocation.xib b/chrome/app/nibs/ContentBubbleGeolocation.xib index f3a9046..d13a55c 100644 --- a/chrome/app/nibs/ContentBubbleGeolocation.xib +++ b/chrome/app/nibs/ContentBubbleGeolocation.xib @@ -26,7 +26,7 @@ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSCustomObject" id="1001"> - <string key="NSClassName">ContentBlockedBubbleController</string> + <string key="NSClassName">ContentSettingBubbleController</string> </object> <object class="NSCustomObject" id="1003"> <string key="NSClassName">FirstResponder</string> @@ -477,7 +477,7 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">ContentBlockedBubbleController</string> + <string key="className">ContentSettingBubbleController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.h b/chrome/browser/cocoa/content_setting_bubble_cocoa.h index 56f2313..ecdaaf9 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller.h +++ b/chrome/browser/cocoa/content_setting_bubble_cocoa.h @@ -15,14 +15,14 @@ class ContentSettingBubbleModel; @class InfoBubbleView; -namespace content_blocked_bubble { +namespace content_setting_bubble { // For every "show popup" button, remember the index of the popup tab contents // it should open when clicked. typedef std::map<NSButton*, int> PopupLinks; } // Manages a "content blocked" bubble. -@interface ContentBlockedBubbleController : BaseBubbleController { +@interface ContentSettingBubbleController : BaseBubbleController { @private IBOutlet NSTextField* titleLabel_; IBOutlet NSMatrix* allowBlockRadioGroup_; @@ -38,12 +38,12 @@ typedef std::map<NSButton*, int> PopupLinks; IBOutlet NSButton* infoButton_; scoped_ptr<ContentSettingBubbleModel> contentSettingBubbleModel_; - content_blocked_bubble::PopupLinks popupLinks_; + content_setting_bubble::PopupLinks popupLinks_; } // Creates and shows a content blocked bubble. Takes ownership of // |contentSettingBubbleModel| but not of the other objects. -+ (ContentBlockedBubbleController*) ++ (ContentSettingBubbleController*) showForModel:(ContentSettingBubbleModel*)contentSettingBubbleModel parentWindow:(NSWindow*)parentWindow anchoredAt:(NSPoint)anchoredAt; diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_setting_bubble_cocoa.mm index bf67d92..de4f73a 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm +++ b/chrome/browser/cocoa/content_setting_bubble_cocoa.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" +#import "chrome/browser/cocoa/content_setting_bubble_cocoa.h" #include "app/l10n_util.h" #include "base/command_line.h" @@ -80,7 +80,7 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) { } // namespace -@interface ContentBlockedBubbleController(Private) +@interface ContentSettingBubbleController(Private) - (id)initWithModel:(ContentSettingBubbleModel*)settingsBubbleModel parentWindow:(NSWindow*)parentWindow anchoredAt:(NSPoint)anchoredAt; @@ -99,14 +99,14 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) { - (void)clearGeolocationForCurrentHost:(id)sender; @end -@implementation ContentBlockedBubbleController +@implementation ContentSettingBubbleController -+ (ContentBlockedBubbleController*) ++ (ContentSettingBubbleController*) showForModel:(ContentSettingBubbleModel*)contentSettingBubbleModel parentWindow:(NSWindow*)parentWindow anchoredAt:(NSPoint)anchor { // Autoreleases itself on bubble close. - return [[ContentBlockedBubbleController alloc] + return [[ContentSettingBubbleController alloc] initWithModel:contentSettingBubbleModel parentWindow:parentWindow anchoredAt:anchor]; @@ -460,7 +460,7 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) { } - (void)popupLinkClicked:(id)sender { - content_blocked_bubble::PopupLinks::iterator i(popupLinks_.find(sender)); + content_setting_bubble::PopupLinks::iterator i(popupLinks_.find(sender)); DCHECK(i != popupLinks_.end()); contentSettingBubbleModel_->OnPopupClicked(i->second); } @@ -470,4 +470,4 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) { [self close]; } -@end // ContentBlockedBubbleController +@end // ContentSettingBubbleController diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm b/chrome/browser/cocoa/content_setting_bubble_cocoa_unittest.mm index 4ecc51a..c42520d 100644 --- a/chrome/browser/cocoa/content_blocked_bubble_controller_unittest.mm +++ b/chrome/browser/cocoa/content_setting_bubble_cocoa_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" +#import "chrome/browser/cocoa/content_setting_bubble_cocoa.h" #import <Cocoa/Cocoa.h> @@ -25,11 +25,11 @@ class DummyContentSettingBubbleModel : public ContentSettingBubbleModel { } }; -class ContentBlockedBubbleControllerTest : public CocoaTest { +class ContentSettingBubbleControllerTest : public CocoaTest { }; // Check that the bubble doesn't crash or leak for any settings type -TEST_F(ContentBlockedBubbleControllerTest, Init) { +TEST_F(ContentSettingBubbleControllerTest, Init) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { if (i == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) continue; // Notifications have no bubble. @@ -47,7 +47,7 @@ TEST_F(ContentBlockedBubbleControllerTest, Init) { else [parent.get() orderBack:nil]; - ContentBlockedBubbleController* controller = [ContentBlockedBubbleController + ContentSettingBubbleController* controller = [ContentSettingBubbleController showForModel:new DummyContentSettingBubbleModel(settingsType) parentWindow:parent anchoredAt:NSMakePoint(50, 20)]; diff --git a/chrome/browser/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/cocoa/location_bar/content_setting_decoration.mm index fd9a2ce..e0314b4 100644 --- a/chrome/browser/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/cocoa/location_bar/content_setting_decoration.mm @@ -8,7 +8,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" +#import "chrome/browser/cocoa/content_setting_bubble_cocoa.h" #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/browser/content_setting_image_model.h" #include "chrome/browser/content_setting_bubble_model.h" @@ -94,7 +94,7 @@ bool ContentSettingDecoration::OnMousePressed(NSRect frame) { ContentSettingBubbleModel::CreateContentSettingBubbleModel( tabContents, profile_, content_setting_image_model_->get_content_settings_type()); - [ContentBlockedBubbleController showForModel:model + [ContentSettingBubbleController showForModel:model parentWindow:[field window] anchoredAt:anchor]; return true; diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm index 0619dab..1c40542 100644 --- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm @@ -16,7 +16,7 @@ #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include "chrome/browser/browser_list.h" -#import "chrome/browser/cocoa/content_blocked_bubble_controller.h" +#import "chrome/browser/cocoa/content_setting_bubble_cocoa.h" #include "chrome/browser/cocoa/event_utils.h" #import "chrome/browser/cocoa/extensions/extension_action_context_menu.h" #import "chrome/browser/cocoa/extensions/extension_popup_controller.h" diff --git a/chrome/browser/views/content_blocked_bubble_contents.cc b/chrome/browser/views/content_setting_bubble_views.cc index 945490b..f0f541e 100644 --- a/chrome/browser/views/content_blocked_bubble_contents.cc +++ b/chrome/browser/views/content_setting_bubble_views.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/views/content_blocked_bubble_contents.h" +#include "chrome/browser/views/content_setting_bubble_views.h" #if defined(OS_LINUX) #include <gdk/gdk.h> diff --git a/chrome/browser/views/content_blocked_bubble_contents.h b/chrome/browser/views/content_setting_bubble_views.h index 6d6c72c..93ae7f0 100644 --- a/chrome/browser/views/content_blocked_bubble_contents.h +++ b/chrome/browser/views/content_setting_bubble_views.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_VIEWS_CONTENT_BLOCKED_BUBBLE_CONTENTS_H_ -#define CHROME_BROWSER_VIEWS_CONTENT_BLOCKED_BUBBLE_CONTENTS_H_ +#ifndef CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_VIEWS_H_ +#define CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_VIEWS_H_ #pragma once #include <map> @@ -100,4 +100,4 @@ class ContentSettingBubbleContents : public views::View, DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents); }; -#endif // CHROME_BROWSER_VIEWS_CONTENT_BLOCKED_BUBBLE_CONTENTS_H_ +#endif // CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_VIEWS_H_ diff --git a/chrome/browser/views/location_bar/content_setting_image_view.cc b/chrome/browser/views/location_bar/content_setting_image_view.cc index fa087fa..8404e34 100644 --- a/chrome/browser/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/views/location_bar/content_setting_image_view.cc @@ -9,7 +9,7 @@ #include "chrome/browser/content_setting_bubble_model.h" #include "chrome/browser/content_setting_image_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/content_blocked_bubble_contents.h" +#include "chrome/browser/views/content_setting_bubble_views.h" #include "chrome/browser/views/location_bar/location_bar_view.h" ContentSettingImageView::ContentSettingImageView( diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index c9ad4c9..debcb6a 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -768,10 +768,10 @@ 'browser/cocoa/command_observer_bridge.mm', 'browser/cocoa/constrained_window_mac.h', 'browser/cocoa/constrained_window_mac.mm', - 'browser/cocoa/content_blocked_bubble_controller.h', - 'browser/cocoa/content_blocked_bubble_controller.mm', 'browser/cocoa/content_exceptions_window_controller.h', 'browser/cocoa/content_exceptions_window_controller.mm', + 'browser/cocoa/content_setting_bubble_cocoa.h', + 'browser/cocoa/content_setting_bubble_cocoa.mm', 'browser/cocoa/content_settings_dialog_controller.h', 'browser/cocoa/content_settings_dialog_controller.mm', 'browser/cocoa/cookie_details.h', @@ -2640,8 +2640,8 @@ 'browser/views/confirm_message_box_dialog.h', 'browser/views/constrained_window_win.cc', 'browser/views/constrained_window_win.h', - 'browser/views/content_blocked_bubble_contents.cc', - 'browser/views/content_blocked_bubble_contents.h', + 'browser/views/content_setting_bubble_views.cc', + 'browser/views/content_setting_bubble_views.h', 'browser/views/cookie_info_view.cc', 'browser/views/cookie_info_view.h', 'browser/views/cookie_prompt_view.cc', @@ -3348,8 +3348,8 @@ ['include', '^browser/views/chrome_views_delegate.cc'], ['include', '^browser/views/clear_browsing_data.cc'], ['include', '^browser/views/clear_browsing_data.h'], - ['include', '^browser/views/content_blocked_bubble_contents.cc'], - ['include', '^browser/views/content_blocked_bubble_contents.h'], + ['include', '^browser/views/content_setting_bubble_views.cc'], + ['include', '^browser/views/content_setting_bubble_views.h'], ['include', '^browser/views/create_application_shortcut_view.cc'], ['include', '^browser/views/create_application_shortcut_view.h'], ['include', '^browser/views/detachable_toolbar_view.h'], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index cbc70b0..1a52731 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -813,8 +813,8 @@ 'browser/cocoa/cocoa_test_helper.mm', 'browser/cocoa/collected_cookies_mac_unittest.mm', 'browser/cocoa/command_observer_bridge_unittest.mm', - 'browser/cocoa/content_blocked_bubble_controller_unittest.mm', 'browser/cocoa/content_exceptions_window_controller_unittest.mm', + 'browser/cocoa/content_setting_bubble_cocoa_unittest.mm', 'browser/cocoa/content_settings_dialog_controller_unittest.mm', 'browser/cocoa/cookie_details_unittest.mm', 'browser/cocoa/cookie_details_view_controller_unittest.mm', |