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

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

Issue 18355002: Move HyperlinkButtonCell to /ui/base/cocoa/controls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: helpful comment Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/content_settings/host_content_settings_map.h" 12 #include "chrome/browser/content_settings/host_content_settings_map.h"
13 #include "chrome/browser/plugins/plugin_finder.h" 13 #include "chrome/browser/plugins/plugin_finder.h"
14 #include "chrome/browser/plugins/plugin_metadata.h" 14 #include "chrome/browser/plugins/plugin_metadata.h"
15 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
16 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 15 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
17 #import "chrome/browser/ui/cocoa/l10n_util.h" 16 #import "chrome/browser/ui/cocoa/l10n_util.h"
18 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 17 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
19 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h" 18 #include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"
20 #include "content/public/browser/plugin_service.h" 19 #include "content/public/browser/plugin_service.h"
21 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
22 #include "skia/ext/skia_utils_mac.h" 21 #include "skia/ext/skia_utils_mac.h"
23 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 22 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
23 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 25
26 using content::PluginService; 26 using content::PluginService;
27 27
28 namespace { 28 namespace {
29 29
30 // Height of one link in the popup list. 30 // Height of one link in the popup list.
31 const int kLinkHeight = 16; 31 const int kLinkHeight = 16;
32 32
33 // Space between two popup links. 33 // Space between two popup links.
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index))); 692 button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
693 693
694 it->second->model->ExecuteCommand(index, 0); 694 it->second->model->ExecuteCommand(index, 0);
695 } 695 }
696 696
697 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus { 697 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
698 return &mediaMenus_; 698 return &mediaMenus_;
699 } 699 }
700 700
701 @end // ContentSettingBubbleController 701 @end // ContentSettingBubbleController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698