summaryrefslogtreecommitdiffstats
path: root/chrome/browser/toolbar_model.cc
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 13:21:35 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-11 13:21:35 +0000
commit332af773603ecd4c78eca598c5f7ce8d70304381 (patch)
tree488022539a7f86b2738f3dbbebf27a8404b49f0c /chrome/browser/toolbar_model.cc
parent0c3a4045d8f50a0c7b7962f5d496927ad5b4e717 (diff)
downloadchromium_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/toolbar_model.cc')
-rw-r--r--chrome/browser/toolbar_model.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc
index 999514b..93a224c 100644
--- a/chrome/browser/toolbar_model.cc
+++ b/chrome/browser/toolbar_model.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/ssl/ssl_error_info.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/gfx/text_elider.h"
#include "chrome/common/l10n_util.h"
#include "chrome/common/pref_names.h"
@@ -15,12 +16,6 @@
#include "grit/generated_resources.h"
#include "net/base/net_util.h"
-#if defined(OS_WIN)
-#include "chrome/browser/tab_contents/tab_contents.h"
-#elif defined(OS_POSIX)
-// TODO(port): remove when tab_contents is ported
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
ToolbarModel::ToolbarModel() : input_in_progress_(false) {
}