summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/browser.cc1
-rw-r--r--chrome/browser/browsing_data_remover.cc1
-rw-r--r--chrome/browser/profile.cc12
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc2
-rw-r--r--chrome/browser/search_engines/template_url_model.cc12
-rw-r--r--chrome/browser/tab_contents/web_contents.cc2
-rw-r--r--chrome/browser/visitedlink_master.cc8
-rw-r--r--chrome/test/testing_profile.cc9
-rw-r--r--chrome/test/unit/unit_tests.scons4
9 files changed, 14 insertions, 37 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 3e5ae22..440c959 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/location_bar.h"
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 2fccb58..059c90f 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/history/history.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/search_engines/template_url_model.h"
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 43c44f3..00fc733 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -11,10 +11,12 @@
#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "chrome/app/locales/locale_settings.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extensions_service.h"
#include "chrome/browser/extensions/user_script_master.h"
+#include "chrome/browser/history/history.h"
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/profile_manager.h"
#include "chrome/browser/renderer_host/render_process_host.h"
@@ -41,9 +43,7 @@
// TODO(port): Get rid of this section and finish porting.
#if defined(OS_WIN)
-#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/download/download_manager.h"
-#include "chrome/browser/history/history.h"
#include "chrome/browser/search_engines/template_url_fetcher.h"
#include "chrome/browser/spellchecker.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
@@ -343,7 +343,7 @@ void ProfileImpl::InitExtensions() {
const CommandLine* command_line = CommandLine::ForCurrentProcess();
bool user_scripts_enabled =
command_line->HasSwitch(switches::kEnableUserScripts);
- bool extensions_enabled =
+ bool extensions_enabled =
command_line->HasSwitch(switches::kEnableExtensions);
FilePath script_dir;
@@ -693,7 +693,7 @@ void ProfileImpl::ResetTabRestoreService() {
tab_restore_service_ = NULL;
}
-// To be run in the IO thread to notify all resource message filters that the
+// To be run in the IO thread to notify all resource message filters that the
// spellchecker has changed.
class NotifySpellcheckerChangeTask : public Task {
public:
@@ -737,7 +737,7 @@ void ProfileImpl::InitializeSpellChecker(bool need_to_broadcast) {
if (enable_spellcheck) {
std::wstring dict_dir;
PathService::Get(chrome::DIR_APP_DICTIONARIES, &dict_dir);
- // Note that, as the object pointed to by previously by spellchecker_
+ // Note that, as the object pointed to by previously by spellchecker_
// is being deleted in the io thread, the spellchecker_ can be made to point
// to a new object (RE-initialized) in parallel in this UI thread.
spellchecker_ = new SpellChecker(dict_dir,
@@ -753,7 +753,7 @@ void ProfileImpl::InitializeSpellChecker(bool need_to_broadcast) {
scoped_spellchecker.spellchecker = spellchecker_;
if (io_thread) {
io_thread->message_loop()->PostTask(
- FROM_HERE,
+ FROM_HERE,
new NotifySpellcheckerChangeTask(this, scoped_spellchecker));
}
}
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index eabce0e..1e3bcc5 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/cache_manager_host.h"
#include "chrome/browser/extensions/user_script_master.h"
+#include "chrome/browser/history/history.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/renderer_host/render_widget_helper.h"
#include "chrome/browser/renderer_host/renderer_security_policy.h"
@@ -45,7 +46,6 @@
// TODO(port): see comment by the only usage of RenderViewHost in this file.
#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/history/history.h"
#include "chrome/browser/spellchecker.h"
// Once the above TODO is finished, then this block is all Windows-specific
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index 1262780..bfb9d43 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -11,6 +11,7 @@
#include "chrome/app/locales/locale_settings.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/google_url_tracker.h"
+#include "chrome/browser/history/history.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/rlz/rlz.h"
#include "chrome/browser/search_engines/template_url.h"
@@ -26,17 +27,6 @@
#include "unicode/rbbi.h"
#include "unicode/uchar.h"
-#if defined(OS_POSIX)
-// TODO(port): get rid of this include. It's used just to provide declarations
-// and stub definitions for classes we encouter during the porting effort.
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
-// TODO(port): Get rid of this section and finish porting.
-#if defined(OS_WIN)
-#include "chrome/browser/history/history.h"
-#endif
-
using base::Time;
// String in the URL that is replaced by the search term.
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index bfbedc1..010957a 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -11,6 +11,7 @@
#include "base/string_util.h"
#include "chrome/app/locales/locale_settings.h"
#include "chrome/browser/autofill_manager.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/dom_operation_notification_details.h"
#include "chrome/browser/google_util.h"
@@ -37,7 +38,6 @@
#if defined(OS_WIN)
// TODO(port): fill these in as we flesh out the implementation of this class
-#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/cache_manager_host.h"
#include "chrome/browser/character_encoding.h"
#include "chrome/browser/download/download_manager.h"
diff --git a/chrome/browser/visitedlink_master.cc b/chrome/browser/visitedlink_master.cc
index e24f80c..635beb3 100644
--- a/chrome/browser/visitedlink_master.cc
+++ b/chrome/browser/visitedlink_master.cc
@@ -23,14 +23,8 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/profile.h"
-#if defined(OS_WIN)
#include "chrome/browser/history/history.h"
-#else
-// TODO(port): We should be using history.h, remove scaffolding
-// when it is ported.
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif // !defined(OS_WIN)
+#include "chrome/browser/profile.h"
#if defined(OS_WIN)
#include "chrome/common/win_util.h"
#endif
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index ba3f77c..cde8ff1 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -5,14 +5,9 @@
#include "chrome/test/testing_profile.h"
#include "base/string_util.h"
-#include "chrome/common/chrome_constants.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/history/history_backend.h"
-
-#if defined(OS_POSIX)
-// TODO(port): get rid of this include. It's used just to provide declarations
-// and stub definitions for classes we encouter during the porting effort.
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
+#include "chrome/common/chrome_constants.h"
using base::Time;
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index 84e709d..394df33 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -387,11 +387,7 @@ if not env.Bit('windows'):
'$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
'$CHROME_DIR/browser/download/save_package_unittest.cc',
'$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
- '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
- '$CHROME_DIR/browser/history/history_backend_unittest.cc',
- '$CHROME_DIR/browser/history/history_querying_unittest.cc',
'$CHROME_DIR/browser/history/history_unittest.cc',
- '$CHROME_DIR/browser/history/starred_url_database_unittest.cc',
'$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
'$CHROME_DIR/browser/importer/importer_unittest.cc',
'$CHROME_DIR/browser/login_prompt_unittest.cc',
generated by cgit v1.1 at 2025-01-10 22:08:21 +0000