diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:00:45 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 22:00:45 +0000 |
| commit | e191c147e4704d4e75f548cdaf90f914d196aa63 (patch) | |
| tree | 566187bf422d3cf5ed8a66a4d7cb6fd05596e02e /chrome/browser/toolbar_model.cc | |
| parent | 60f7ba59cf2b26b9c8d19abfae3ca9fb6cc36cc1 (diff) | |
| download | chromium_src-e191c147e4704d4e75f548cdaf90f914d196aa63.zip chromium_src-e191c147e4704d4e75f548cdaf90f914d196aa63.tar.gz chromium_src-e191c147e4704d4e75f548cdaf90f914d196aa63.tar.bz2 | |
Change url bar text according to the model when updating the toolbar. Fix vtable issue in ToolbarModel by using correct declaration.
Review URL: http://codereview.chromium.org/27163
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/toolbar_model.cc')
| -rw-r--r-- | chrome/browser/toolbar_model.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc index b1d6127..08dc00b 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/toolbar_model.cc @@ -8,7 +8,6 @@ #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" @@ -16,6 +15,13 @@ #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) { } |