summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 22:27:34 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 22:27:34 +0000
commit6104acf50ffd0e5ed1ffb4c2f29ee09a33a8b843 (patch)
treef407b3230d0b48544b0192558dc1bd27935667f2 /chrome/browser
parent3ccbdb9370f53c006b8d677ff90776df94da79a1 (diff)
downloadchromium_src-6104acf50ffd0e5ed1ffb4c2f29ee09a33a8b843.zip
chromium_src-6104acf50ffd0e5ed1ffb4c2f29ee09a33a8b843.tar.gz
chromium_src-6104acf50ffd0e5ed1ffb4c2f29ee09a33a8b843.tar.bz2
Remove ShowAndFit variation of Browser::Show, since the "varation" doesn't seem to actually work.
Review URL: http://codereview.chromium.org/10807 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser.cc4
-rw-r--r--chrome/browser/browser.h6
-rw-r--r--chrome/browser/session_restore.cc2
3 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 5213b4b..07d4b9f 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -280,7 +280,9 @@ Browser::~Browser() {
select_file_dialog_->ListenerDestroyed();
}
-void Browser::ShowAndFit(bool resize_to_fit) {
+void Browser::Show() {
+ // TODO(beng): this entire function should move to BrowserWindow.
+
// Only allow one call after the browser is created.
if (initial_show_command_ < 0) {
// The frame is already visible, we're being invoked again either by the
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index dcbb3b7..48d6fef 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -56,11 +56,7 @@ class Browser : public TabStripModelDelegate,
//
// Ideally, this function is called after everything in the window is
// initialized so that we do not have to repaint again.
- void Show() { ShowAndFit(false); }
-
- // Like Show, but the window is optionally resized and moved to be on the
- // default screen.
- void ShowAndFit(bool resize_to_fit);
+ void Show();
// Returns the Browser which contains the tab with the given
// NavigationController, also filling in |index| (if valid) with the tab's
diff --git a/chrome/browser/session_restore.cc b/chrome/browser/session_restore.cc
index 057b46b..dba5334ff 100644
--- a/chrome/browser/session_restore.cc
+++ b/chrome/browser/session_restore.cc
@@ -363,7 +363,7 @@ class SessionRestoreImpl : public NotificationObserver {
browser->SelectTabContentsAt(
std::min(initial_tab_count + std::max(0, selected_session_index),
browser->tab_count() - 1), true);
- browser->ShowAndFit(true);
+ browser->Show();
}
void AppendURLsToBrowser(Browser* browser, const std::vector<GURL>& urls) {