4 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
index 0bbdc7d..be39c8d 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -1049,7 +1049,6 @@ void OpaqueBrowserFrameView::InitAppWindowResources() {
 #if defined(OS_WIN)
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #else
-    NOTIMPLEMENTED();
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index fb5ca9f..b607c06 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -1054,7 +1054,7 @@ void LocationBarView::ShowFirstRunBubbleInternal(bool use_OEM_bubble) {
 #if defined(OS_WIN)
   FirstRunBubble::Show(profile_, GetWindow(), bounds, use_OEM_bubble);
 #else
-  NOTIMPLEMENTED();
+  // First run bubble doesn't make sense for Chrome OS.
 #endif
 }
 
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 2c87d7a..9ce0ef5 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -47,10 +47,8 @@
 #include "views/background.h"
 #include "views/controls/button/button_dropdown.h"
 #include "views/controls/label.h"
-#include "views/widget/tooltip_manager.h"
-#if defined(OS_WIN)
 #include "views/drag_utils.h"
-#endif
+#include "views/widget/tooltip_manager.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
 
@@ -752,7 +750,6 @@ void ToolbarView::WriteDragData(views::View* sender,
 
   UserMetrics::RecordAction(L"Toolbar_DragStar", profile_);
 
-#if defined(OS_WIN)
   // If there is a bookmark for the URL, add the bookmark drag data for it. We
   // do this to ensure the bookmark is moved, rather than creating an new
   // bookmark.
@@ -772,10 +769,6 @@ void ToolbarView::WriteDragData(views::View* sender,
                                    tab->GetFavIcon(),
                                    data);
   }
-#else
-  // TODO(port): do bookmark item drag & drop
-  NOTIMPLEMENTED();
-#endif
 }
 
 int ToolbarView::GetDragOperations(views::View* sender, int x, int y) {
diff --git a/views/controls/menu/menu_host_gtk.cc b/views/controls/menu/menu_host_gtk.cc
index f79f3363b..aee0d17 100644
--- a/views/controls/menu/menu_host_gtk.cc
+++ b/views/controls/menu/menu_host_gtk.cc
@@ -19,7 +19,6 @@ MenuHost::MenuHost(SubmenuView* submenu)
       closed_(false),
       submenu_(submenu),
       did_pointer_grab_(false) {
-  // TODO(sky): make sure this is needed.
   GdkModifierType current_event_mod;
   if (gtk_get_current_event_state(&current_event_mod)) {
     set_mouse_down(