diff options
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 12 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 15 |
2 files changed, 15 insertions, 12 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 3a65d3e..867529f 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/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(); +} diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index 76d2d60..23c11ed 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/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) @@ -266,22 +265,16 @@ 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 |