summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/gfx/font_mac.mm2
-rw-r--r--chrome/browser/app_controller_mac.mm4
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc10
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_mac.mm1
-rw-r--r--chrome/browser/tab_restore_uitest.cc2
-rw-r--r--chrome/browser/tabs/tab_strip_model.h4
6 files changed, 6 insertions, 17 deletions
diff --git a/app/gfx/font_mac.mm b/app/gfx/font_mac.mm
index abbf6f4..32b8bef 100644
--- a/app/gfx/font_mac.mm
+++ b/app/gfx/font_mac.mm
@@ -83,7 +83,7 @@ int Font::FontSize() {
}
NativeFont Font::nativeFont() const {
- // TODO(pinkerton): apply |style_| to font.
+ // TODO(pinkerton): apply |style_| to font. http://crbug.com/34667
// We could cache this, but then we'd have to conditionally change the
// dtor just for MacOS. Not sure if we want to/need to do that.
return [NSFont fontWithName:base::SysWideToNSString(font_name_)
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index ffd9aad..bfd0e4c 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -286,10 +286,6 @@ static bool g_is_opening_new_window = false;
// update the UI based on the new main window.
- (void)windowLayeringDidChange:(NSNotification*)notify {
[self delayedFixCloseMenuItemKeyEquivalents];
-
- // TODO(pinkerton): If we have other things here, such as inspector panels
- // that follow the contents of the selected webpage, we would update those
- // here.
}
// Called when the number of tabs changes in one of the browser windows. The
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
index 469dba7..3c22b13 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -193,11 +193,11 @@ TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) {
// Tests that the onbeforeunload and onunload logic is shortcutted if the old
// renderer is gone. In that case, we don't want to wait for the old renderer
// to run the handlers.
-// TODO(pinkerton): We need to disable this because the crash causes
-// the OS CrashReporter process to kick in to analyze the poor dead renderer.
-// Unfortunately, if the app isn't stripped of debug symbols, this takes about
-// five minutes to complete and isn't conducive to quick turnarounds. As we
-// don't currently strip the app on the build bots, this is bad times.
+// We need to disable this on Mac because the crash causes the OS CrashReporter
+// process to kick in to analyze the poor dead renderer. Unfortunately, if the
+// app isn't stripped of debug symbols, this takes about five minutes to
+// complete and isn't conducive to quick turnarounds. As we don't currently
+// strip the app on the build bots, this is bad times.
TEST_F(ResourceDispatcherTest, CrossSiteAfterCrash) {
// This test only works in multi-process mode
if (in_process_renderer())
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index 8a89d31..5559fe8 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -329,7 +329,6 @@ void TabContentsViewMac::Observe(NotificationType type,
}
// Registers for the view for the appropriate drag types.
-// TODO(pinkerton): register for file drags.
- (void)registerDragTypes {
NSArray* types = [NSArray arrayWithObjects:NSStringPboardType,
NSHTMLPboardType, NSURLPboardType, nil];
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index 69c66f4..4b4d28b 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -324,8 +324,6 @@ TEST_F(TabRestoreUITest, DISABLED_DontLoadRestoredTab) {
ASSERT_EQ(current_tab_count, starting_tab_count + 2);
// Make sure that there's nothing else to restore.
- // TODO(pinkerton): This currently fails because the command_updater in the
- // always says yes. See bug above.
bool is_timeout = false;
bool enabled =
browser_proxy->IsPageMenuCommandEnabledWithTimeout(IDC_RESTORE_TAB,
diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h
index 52bb3d6..8e3fa61 100644
--- a/chrome/browser/tabs/tab_strip_model.h
+++ b/chrome/browser/tabs/tab_strip_model.h
@@ -534,10 +534,6 @@ class TabStripModel : public NotificationObserver {
// The specified contents should be opened in a new tabstrip. Returns the
// Browser that holds it.
- // TODO(pinkerton): I really don't like the fact that this is returning a
- // Browser object, there may be some better abstraction we can achieve that
- // the Browser implements, but for now, we'll experiment with returning
- // that type.
Browser* TearOffTabContents(TabContents* detached_contents,
const gfx::Rect& window_bounds,
const DockInfo& dock_info);