diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 13:21:35 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 13:21:35 +0000 |
| commit | 332af773603ecd4c78eca598c5f7ce8d70304381 (patch) | |
| tree | 488022539a7f86b2738f3dbbebf27a8404b49f0c /chrome/browser/tabs | |
| parent | 0c3a4045d8f50a0c7b7962f5d496927ad5b4e717 (diff) | |
| download | chromium_src-332af773603ecd4c78eca598c5f7ce8d70304381.zip chromium_src-332af773603ecd4c78eca598c5f7ce8d70304381.tar.gz chromium_src-332af773603ecd4c78eca598c5f7ce8d70304381.tar.bz2 | |
Remove TabContents from scaffolding. Yay!
Review URL: http://codereview.chromium.org/43039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_order_controller.cc | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index e312071..36b8f52 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -6,18 +6,12 @@ #include <algorithm> -#if defined(OS_WIN) -#include "chrome/browser/tab_contents/tab_contents.h" -#elif defined(OS_MACOSX) || (OS_LINUX) -// TODO(port): remove this when the mocks of the above classes are removed -#include "chrome/common/temp_scaffolding_stubs.h" -#endif - #include "base/string_util.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/tabs/tab_strip_model_order_controller.h" #include "chrome/browser/tab_contents/navigation_controller.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.cc b/chrome/browser/tabs/tab_strip_model_order_controller.cc index f483f2b..0c6326a 100644 --- a/chrome/browser/tabs/tab_strip_model_order_controller.cc +++ b/chrome/browser/tabs/tab_strip_model_order_controller.cc @@ -4,12 +4,7 @@ #include "chrome/browser/tabs/tab_strip_model_order_controller.h" -#if defined(OS_WIN) #include "chrome/browser/tab_contents/tab_contents.h" -#elif defined(OS_MACOSX) || (OS_LINUX) -// TODO(port): remove this when the mock of TabContents is removed -#include "chrome/common/temp_scaffolding_stubs.h" -#endif #include "chrome/common/pref_names.h" /////////////////////////////////////////////////////////////////////////////// |