diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 23:58:31 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 23:58:31 +0000 |
| commit | 075ae739d9f5693eb1bbd203af59eef1bb21606e (patch) | |
| tree | 48fc2d8128ff99e16fe6b1391cdcfb0ffeca1bf1 /chrome/browser | |
| parent | a27a938d8511abfaf89d6e2d0e4d4242c76dffed (diff) | |
| download | chromium_src-075ae739d9f5693eb1bbd203af59eef1bb21606e.zip chromium_src-075ae739d9f5693eb1bbd203af59eef1bb21606e.tar.gz chromium_src-075ae739d9f5693eb1bbd203af59eef1bb21606e.tar.bz2 | |
Bring history.cc and dependents into the build.
Review URL: http://codereview.chromium.org/20284
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser.scons | 3 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 1 | ||||
| -rwxr-xr-x | chrome/browser/webdata/web_database.cc | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 00ac75c..5929b4c 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -672,8 +672,6 @@ if not env.Bit('windows'): 'bookmarks/bookmark_context_menu.cc', 'bookmarks/bookmark_drag_data.cc', 'bookmarks/bookmark_drop_info.cc', - 'bookmarks/bookmark_model.cc', - 'bookmarks/bookmark_storage.cc', 'bookmarks/bookmark_utils.cc', 'browser_about_handler.cc', 'browser_accessibility.cc', @@ -707,7 +705,6 @@ if not env.Bit('windows'): 'gears_integration.cc', 'hang_monitor/hung_plugin_action.cc', 'hang_monitor/hung_window_detector.cc', - 'history/history.cc', 'history_tab_ui.cc', 'history_view.cc', 'icon_loader.cc', diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index cf6b1ab..06324d7 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -10,7 +10,6 @@ #include "base/gfx/native_widget_types.h" #include "base/gfx/rect.h" -#include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/navigation_controller.h" diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc index 5c33c1a..7fcfa4c 100755 --- a/chrome/browser/webdata/web_database.cc +++ b/chrome/browser/webdata/web_database.cc @@ -13,6 +13,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/values.h" +#include "chrome/browser/history/history_database.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/l10n_util.h" #include "chrome/common/scoped_vector.h" @@ -29,7 +30,6 @@ // Encryptor is the *wrong* way of doing things; we need to turn it into a // bottleneck to use the platform methods (e.g. Keychain on the Mac). That's // going to take a massive change in its API... -#include "chrome/browser/history/history_database.h" #include "chrome/browser/password_manager/encryptor.h" #endif |