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

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

Issue 6621076: [Mac] Remove native/Cocoa preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase switch removal Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/content_settings/content_setting_bubble_cocoa.h " 5 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h "
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/sys_string_conversions.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/blocked_content_container.h" 11 #include "chrome/browser/blocked_content_container.h"
12 #include "chrome/browser/content_setting_bubble_model.h" 12 #include "chrome/browser/content_setting_bubble_model.h"
13 #include "chrome/browser/content_settings/host_content_settings_map.h" 13 #include "chrome/browser/content_settings/host_content_settings_map.h"
14 #include "chrome/browser/plugin_updater.h" 14 #include "chrome/browser/plugin_updater.h"
15 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" 15 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
16 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 16 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
17 #import "chrome/browser/ui/cocoa/l10n_util.h" 17 #import "chrome/browser/ui/cocoa/l10n_util.h"
18 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h"
19 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
20 #include "skia/ext/skia_utils_mac.h" 19 #include "skia/ext/skia_utils_mac.h"
21 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 20 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
22 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
23 #include "webkit/glue/plugins/plugin_list.h" 22 #include "webkit/glue/plugins/plugin_list.h"
24 23
25 namespace { 24 namespace {
26 25
27 // Must match the tag of the unblock radio button in the xib files. 26 // Must match the tag of the unblock radio button in the xib files.
28 const int kAllowTag = 1; 27 const int kAllowTag = 1;
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 480
482 - (IBAction)manageBlocking:(id)sender { 481 - (IBAction)manageBlocking:(id)sender {
483 contentSettingBubbleModel_->OnManageLinkClicked(); 482 contentSettingBubbleModel_->OnManageLinkClicked();
484 } 483 }
485 484
486 - (IBAction)closeBubble:(id)sender { 485 - (IBAction)closeBubble:(id)sender {
487 [self close]; 486 [self close];
488 } 487 }
489 488
490 @end // ContentSettingBubbleController 489 @end // ContentSettingBubbleController
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/clear_browsing_data_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/options/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698