diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 21:44:43 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-04 21:44:43 +0000 |
| commit | 20de1f9566d647c86e3aaef7180fd359d3e0b6f8 (patch) | |
| tree | a27edae82b8bf016643e262a759a1a66ac6e93a2 /chrome | |
| parent | 55664ebb55ef609e9af61094b862bc6bd08d89b5 (diff) | |
| download | chromium_src-20de1f9566d647c86e3aaef7180fd359d3e0b6f8.zip chromium_src-20de1f9566d647c86e3aaef7180fd359d3e0b6f8.tar.gz chromium_src-20de1f9566d647c86e3aaef7180fd359d3e0b6f8.tar.bz2 | |
Revert "Hook up the app title to the page title."
This reverts commit 10923.
Review URL: http://codereview.chromium.org/40130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index b3c7949..d78f675 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -38,9 +38,6 @@ #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" #endif -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" -#include "grit/locale_settings.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_policy.h" #include "net/base/net_util.h" @@ -72,6 +69,9 @@ #include "chrome/browser/window_sizer.h" #include "chrome/common/child_process_host.h" #include "chrome/common/win_util.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #endif // OS_WIN @@ -391,6 +391,7 @@ SkBitmap Browser::GetCurrentPageIcon() const { } std::wstring Browser::GetCurrentPageTitle() const { +#if defined(OS_WIN) TabContents* contents = tabstrip_model_.GetSelectedTabContents(); std::wstring title; @@ -404,6 +405,10 @@ std::wstring Browser::GetCurrentPageTitle() const { title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE); return l10n_util::GetStringF(IDS_BROWSER_WINDOW_TITLE_FORMAT, title); +#elif defined(OS_POSIX) + // TODO(port): turn on when generating chrome_strings.h from grit + return L"untitled"; +#endif } // static diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 038bf2e..bdfcb7e 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -232,12 +232,7 @@ void BrowserWindowGtk::SelectedTabToolbarSizeChanged(bool is_animating) { } void BrowserWindowGtk::UpdateTitleBar() { - std::wstring title = browser_->GetCurrentPageTitle(); - gtk_window_set_title(window_, WideToUTF8(title).c_str()); - if (browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR)) { - // If we're showing a title bar, we should update the app icon. - NOTIMPLEMENTED(); - } + NOTIMPLEMENTED(); } void BrowserWindowGtk::UpdateLoadingAnimations(bool should_animate) { |