Get rid of a few NOTIMPLEMENTEDs in the scaffolding.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/209035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26608 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/app_controller_mac.mm

@@ -29,8 +29,9 @@
 #import "chrome/browser/cocoa/tab_window_controller.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/download/download_manager.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/options_window.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ -674,3 +675,12 @@
 }
 
 @end
+
+//---------------------------------------------------------------------------
+
+// Stub for cross-platform method that isn't called on Mac OS X.
+void ShowOptionsWindow(OptionsPage page,
+                       OptionsGroup highlight_group,
+                       Profile* profile) {
+  NOTIMPLEMENTED();
+}

chrome/common/temp_scaffolding_stubs.cc

@@ -21,7 +21,6 @@
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/fonts_languages_window.h"
 #include "chrome/browser/memory_details.h"
-#include "chrome/browser/options_window.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
@@ -265,23 +264,17 @@ void BrowserList::AllBrowsersClosed() {
 
 //--------------------------------------------------------------------------
 
-#if defined(OS_MACOSX)
-void ShowOptionsWindow(OptionsPage page,
-                       OptionsGroup highlight_group,
-                       Profile* profile) {
-  NOTIMPLEMENTED();
-}
-#endif
-
 #if defined(OS_MACOSX)
 bool DockInfo::GetNewWindowBounds(gfx::Rect* new_window_bounds,
                                   bool* maximize_new_window) const {
-  NOTIMPLEMENTED();
+  // TODO(pinkerton): Implement on Mac.
+  // http://crbug.com/9274
   return true;
 }
 
 void DockInfo::AdjustOtherWindowBounds() const {
-  NOTIMPLEMENTED();
+  // TODO(pinkerton): Implement on Mac.
+  // http://crbug.com/9274
 }
 #endif