diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:40:33 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 18:40:33 +0000 |
commit | e06131db8c610bca50a025fc876755d0aa42e53c (patch) | |
tree | 994dfa08f6b8cd766532306e875585da934cf05f /chrome/browser | |
parent | ef122393f32e86fb5312d373136d99de62274bf8 (diff) | |
download | chromium_src-e06131db8c610bca50a025fc876755d0aa42e53c.zip chromium_src-e06131db8c610bca50a025fc876755d0aa42e53c.tar.gz chromium_src-e06131db8c610bca50a025fc876755d0aa42e53c.tar.bz2 |
Remove the temporary scaffolding stubs.
They have served they purpose well, but now it's time to retire.
It's one of the things that draggen in the bad dependency of chrome/common
on chrome/browser, and is sufficiently small now to stub things out individually.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/593037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
21 files changed, 281 insertions, 44 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 8895354..ffd9aad 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -44,7 +44,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/browser/profile_manager.h" -#include "chrome/common/temp_scaffolding_stubs.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/automation/automation_provider_mac.mm b/chrome/browser/automation/automation_provider_mac.mm index 0ee52a2..907dafc 100644 --- a/chrome/browser/automation/automation_provider_mac.mm +++ b/chrome/browser/automation/automation_provider_mac.mm @@ -16,8 +16,8 @@ void AutomationProvider::SetWindowBounds(int handle, const gfx::Rect& bounds, if (window) { NSRect new_bounds = NSRectFromCGRect(bounds.ToCGRect()); - // This is likely incorrect for a multiple-monitor setup; OK because this is - // used only for testing purposes. + // This is likely incorrect for a multiple-monitor setup; OK because this + // is used only for testing purposes. new_bounds.origin.y = [[window screen] frame].size.height - new_bounds.origin.y - new_bounds.size.height; @@ -67,6 +67,45 @@ void AutomationProvider::PrintAsync(int tab_handle) { NOTIMPLEMENTED(); } +void AutomationProvider::GetAutocompleteEditText( + int autocomplete_edit_handle, bool* success, std::wstring* text) { + *success = false; + NOTIMPLEMENTED(); +} + +void AutomationProvider::SetAutocompleteEditText(int autocomplete_edit_handle, + const std::wstring& text, + bool* success) { + *success = false; + NOTIMPLEMENTED(); +} + +void AutomationProvider::AutocompleteEditIsQueryInProgress( + int autocomplete_edit_handle, bool* success, bool* query_in_progress) { + *success = false; + NOTIMPLEMENTED(); +} + +void AutomationProvider::AutocompleteEditGetMatches( + int autocomplete_edit_handle, bool* success, + std::vector<AutocompleteMatchData>* matches) { + *success = false; + NOTIMPLEMENTED(); +} + +void AutomationProvider::OnMessageFromExternalHost(int handle, + const std::string& message, + const std::string& origin, + const std::string& target) { + NOTIMPLEMENTED(); +} + +void AutomationProvider::GetAutocompleteEditForBrowser( + int browser_handle, bool* success, int* autocomplete_edit_handle) { + *success = false; + NOTIMPLEMENTED(); +} + void AutomationProvider::SetInitialFocus(const IPC::Message& message, int handle, bool reverse) { NOTIMPLEMENTED(); diff --git a/chrome/browser/bookmarks/bookmark_drag_data.h b/chrome/browser/bookmarks/bookmark_drag_data.h index c880922..486d144 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data.h +++ b/chrome/browser/bookmarks/bookmark_drag_data.h @@ -12,11 +12,8 @@ #include "base/string16.h" #include "googleurl/src/gurl.h" -// TODO(port): Port this file. #if defined(TOOLKIT_VIEWS) #include "app/os_exchange_data.h" -#else -#include "chrome/common/temp_scaffolding_stubs.h" #endif class BookmarkModel; diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index ef8f20aa..2e6e0d0 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -27,6 +27,7 @@ #include "chrome/browser/character_encoding.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_window.h" +#include "chrome/browser/dock_info.h" #include "chrome/browser/dom_ui/filebrowse_ui.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" @@ -100,10 +101,6 @@ #include "chrome/common/child_process_host.h" #endif // OS_WIN -#if !defined(OS_MACOSX) -#include "chrome/browser/dock_info.h" -#endif - #if defined(OS_MACOSX) #include "chrome/browser/cocoa/find_pasteboard.h" #endif diff --git a/chrome/browser/browser_list_gtk.cc b/chrome/browser/browser_list_gtk.cc index 99a66dd..cf74096 100644 --- a/chrome/browser/browser_list_gtk.cc +++ b/chrome/browser/browser_list_gtk.cc @@ -6,6 +6,7 @@ #include <gtk/gtk.h> +// static void BrowserList::AllBrowsersClosed() { // Close non-browser windows. GList* window_list = gtk_window_list_toplevels(); diff --git a/chrome/browser/browser_list_stub.cc b/chrome/browser/browser_list_stub.cc new file mode 100644 index 0000000..0459a42 --- /dev/null +++ b/chrome/browser/browser_list_stub.cc @@ -0,0 +1,9 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/browser_list.h" + +// static +void BrowserList::AllBrowsersClosed() { +} diff --git a/chrome/browser/browser_list_win.cc b/chrome/browser/browser_list_win.cc new file mode 100644 index 0000000..a66ddec --- /dev/null +++ b/chrome/browser/browser_list_win.cc @@ -0,0 +1,12 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/browser_list.h" + +#include "views/window/window.h" + +// static +void BrowserList::AllBrowsersClosed() { + views::Window::CloseAllSecondaryWindows(); +} diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 9fecc88..590e0a9 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -30,6 +30,7 @@ #include "chrome/browser/net/sqlite_persistent_cookie_store.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/plugin_service.h" +#include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" @@ -50,13 +51,6 @@ #include "views/focus/view_storage.h" #endif -#if defined(OS_LINUX) -// TODO(port): get rid of this. -#include "chrome/common/temp_scaffolding_stubs.h" -#else -#include "chrome/browser/printing/print_job_manager.h" -#endif - #if defined(IPC_MESSAGE_LOG_ENABLED) #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index 24186b3..3d0d8bd 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -33,7 +33,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/temp_scaffolding_stubs.h" #include "chrome/browser/profile.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/font_language_settings_controller.mm b/chrome/browser/cocoa/font_language_settings_controller.mm index 1aaa548..a080658 100644 --- a/chrome/browser/cocoa/font_language_settings_controller.mm +++ b/chrome/browser/cocoa/font_language_settings_controller.mm @@ -8,6 +8,7 @@ #import "base/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/character_encoding.h" +#include "chrome/browser/fonts_languages_window.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" @@ -16,6 +17,12 @@ NSString* const kCharacterInfoEncoding = @"encoding"; NSString* const kCharacterInfoName = @"name"; NSString* const kCharacterInfoID = @"id"; +void ShowFontsLanguagesWindow(gfx::NativeWindow window, + FontsLanguagesPage page, + Profile* profile) { + NOTIMPLEMENTED(); +} + @interface FontLanguageSettingsController (Private) - (void)updateDisplayField:(NSTextField*)field withFont:(NSFont*)font; @end diff --git a/chrome/browser/dock_info_mac.cc b/chrome/browser/dock_info_mac.cc new file mode 100644 index 0000000..d67588d --- /dev/null +++ b/chrome/browser/dock_info_mac.cc @@ -0,0 +1,17 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/dock_info.h" + +#include "base/logging.h" + +bool DockInfo::GetNewWindowBounds(gfx::Rect* new_window_bounds, + bool* maximize_new_window) const { + // TODO(pinkerton): Implement DockInfo, http://crbug.com/9274. + return true; +} + +void DockInfo::AdjustOtherWindowBounds() const { + // TODO(pinkerton): Implement DockInfo, http://crbug.com/9274. +} diff --git a/chrome/browser/jankometer_mac.cc b/chrome/browser/jankometer_mac.cc new file mode 100644 index 0000000..cf85869 --- /dev/null +++ b/chrome/browser/jankometer_mac.cc @@ -0,0 +1,13 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/jankometer.h" + +void InstallJankometer(const CommandLine& parsed_command_line) { + // TODO(port): Implement jankometer, http://crbug.com/8077 +} + +void UninstallJankometer() { + // TODO(port): Implement jankometer, http://crbug.com/8077 +} diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 54cc138..a1b8903 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -190,10 +190,8 @@ #include "base/rand_util.h" #endif -#if defined(OS_POSIX) -// TODO(port): Move these headers above as they are ported. -#include "chrome/common/temp_scaffolding_stubs.h" -#else +// TODO(port): port browser_distribution.h. +#if !defined(OS_POSIX) #include "chrome/installer/util/browser_distribution.h" #endif diff --git a/chrome/browser/printing/print_job_linux.cc b/chrome/browser/printing/print_job_linux.cc new file mode 100644 index 0000000..f8776a8 --- /dev/null +++ b/chrome/browser/printing/print_job_linux.cc @@ -0,0 +1,17 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/printing/print_job.h" + +#include "base/logging.h" +#include "chrome/browser/printing/print_job_worker.h" +#include "printing/printed_document.h" + +namespace printing { + +PrintJob::PrintJob() : ui_message_loop_(NULL) { + NOTIMPLEMENTED(); +} + +} // namespace printing diff --git a/chrome/browser/printing/print_job_manager_linux.cc b/chrome/browser/printing/print_job_manager_linux.cc new file mode 100644 index 0000000..e148faa --- /dev/null +++ b/chrome/browser/printing/print_job_manager_linux.cc @@ -0,0 +1,41 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/printing/print_job_manager.h" + +#include "base/logging.h" +#include "chrome/browser/printing/print_job.h" +#include "chrome/browser/printing/printer_query.h" +#include "chrome/common/notification_type.h" + +namespace printing { + +PrintJobManager::PrintJobManager() { + NOTIMPLEMENTED(); +} + +PrintJobManager::~PrintJobManager() { + NOTIMPLEMENTED(); +} + +void PrintJobManager::OnQuit() { + NOTIMPLEMENTED(); +} + +void PrintJobManager::QueuePrinterQuery(PrinterQuery* job) { + NOTIMPLEMENTED(); +} + +void PrintJobManager::PopPrinterQuery(int document_cookie, + scoped_refptr<PrinterQuery>* job) { + NOTIMPLEMENTED(); +} + +void PrintJobManager::Observe(NotificationType type, + const NotificationSource& source, + const NotificationDetails& details) { + NOTIMPLEMENTED(); +} + +} // namespace printing diff --git a/chrome/browser/printing/print_view_manager_linux.cc b/chrome/browser/printing/print_view_manager_linux.cc new file mode 100644 index 0000000..cecb721 --- /dev/null +++ b/chrome/browser/printing/print_view_manager_linux.cc @@ -0,0 +1,58 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/printing/print_view_manager.h" + +#include <string> + +#include "base/logging.h" +#include "googleurl/src/gurl.h" +#include "chrome/browser/printing/print_job.h" +#include "chrome/common/notification_type.h" + +namespace printing { + +PrintViewManager::PrintViewManager(TabContents& owner) : owner_(owner) { + NOTIMPLEMENTED(); +} + +PrintViewManager::~PrintViewManager() { + NOTIMPLEMENTED(); +} + +void PrintViewManager::Stop() { + NOTIMPLEMENTED(); +} + +bool PrintViewManager::OnRenderViewGone(RenderViewHost* render_view_host) { + NOTIMPLEMENTED(); + return true; +} + +std::wstring PrintViewManager::RenderSourceName() { + NOTIMPLEMENTED(); + return std::wstring(); +} + +GURL PrintViewManager::RenderSourceUrl() { + NOTIMPLEMENTED(); + return GURL(); +} + +void PrintViewManager::DidGetPrintedPagesCount(int cookie, int number_pages) { + NOTIMPLEMENTED(); +} + +void PrintViewManager::DidPrintPage( + const ViewHostMsg_DidPrintPage_Params& params) { + NOTIMPLEMENTED(); +} + +void PrintViewManager::Observe(NotificationType type, + const NotificationSource& source, + const NotificationDetails& details) { + NOTIMPLEMENTED(); +} + +} // namespace printing diff --git a/chrome/browser/printing/printer_query_linux.cc b/chrome/browser/printing/printer_query_linux.cc new file mode 100644 index 0000000..8de2ff5 --- /dev/null +++ b/chrome/browser/printing/printer_query_linux.cc @@ -0,0 +1,58 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/printing/printer_query.h" + +#include "base/logging.h" +#include "base/task.h" +#include "chrome/browser/printing/print_job_worker.h" + +namespace printing { + +PrinterQuery::PrinterQuery() : ui_message_loop_(NULL) { + NOTIMPLEMENTED(); +} + +PrinterQuery::~PrinterQuery() { + NOTIMPLEMENTED(); +} + +void PrinterQuery::GetSettingsDone(const PrintSettings& new_settings, + PrintingContext::Result result) { + NOTIMPLEMENTED(); +} + +PrintJobWorker* PrinterQuery::DetachWorker(PrintJobWorkerOwner* new_owner) { + NOTIMPLEMENTED(); + return NULL; +} + +void PrinterQuery::GetSettings(GetSettingsAskParam ask_user_for_settings, + gfx::NativeWindow parent_window, + int expected_page_count, + bool has_selection, + CancelableTask* callback) { + NOTIMPLEMENTED(); +} + +void PrinterQuery::StopWorker() { + NOTIMPLEMENTED(); +} + +bool PrinterQuery::is_print_dialog_box_shown() const { + NOTIMPLEMENTED(); + return false; +} + +bool PrinterQuery::is_callback_pending() const { + NOTIMPLEMENTED(); + return false; +} + +bool PrinterQuery::is_valid() const { + NOTIMPLEMENTED(); + return false; +} + +} // namespace printing diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index ae3ddd4..7cf9b0e 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -26,6 +26,8 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notifications_prefs_cache.h" #include "chrome/browser/plugin_service.h" +#include "chrome/browser/printing/print_job_manager.h" +#include "chrome/browser/printing/printer_query.h" #include "chrome/browser/privacy_blacklist/blacklist.h" #include "chrome/browser/privacy_blacklist/blacklist_ui.h" #include "chrome/browser/profile.h" @@ -63,14 +65,6 @@ #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webplugin.h" -#if defined(OS_WIN) || defined(OS_MACOSX) -#include "chrome/browser/printing/print_job_manager.h" -#include "chrome/browser/printing/printer_query.h" -#elif defined(OS_LINUX) || defined(OS_FREEBSD) -// TODO(port) remove this. -#include "chrome/common/temp_scaffolding_stubs.h" -#endif - using WebKit::WebCache; namespace { diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index b66504c..1744f61 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -25,6 +25,7 @@ #include "chrome/browser/find_notification_details.h" #include "chrome/browser/jsmessage_box_client.h" #include "chrome/browser/net/url_request_context_getter.h" +#include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/constrained_window.h" @@ -44,13 +45,6 @@ #include "webkit/glue/password_form.h" #include "webkit/glue/webpreferences.h" -#if defined(OS_LINUX) -// Remove when we've finished porting the supporting classes. -#include "chrome/common/temp_scaffolding_stubs.h" -#elif defined(OS_WIN) || defined(OS_MACOSX) -#include "chrome/browser/printing/print_view_manager.h" -#endif - namespace gfx { class Rect; class Size; diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm index 4b6af63..8a89d31 100644 --- a/chrome/browser/tab_contents/tab_contents_view_mac.mm +++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm @@ -28,8 +28,6 @@ #include "chrome/common/render_messages.h" #import "third_party/mozilla/include/NSPasteboard+Utils.h" -#include "chrome/common/temp_scaffolding_stubs.h" - using WebKit::WebDragOperation; using WebKit::WebDragOperationsMask; diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 6d69366..b6a3e17 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -2121,8 +2121,3 @@ BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { FindBar* BrowserWindow::CreateFindBar(Browser* browser) { return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); } - -// static -void BrowserList::AllBrowsersClosed() { - views::Window::CloseAllSecondaryWindows(); -} |