summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/browser.h2
-rw-r--r--chrome/browser/views/frame/browser_view2.cc2
-rw-r--r--chrome/views/window.cc6
-rw-r--r--chrome/views/window.h3
4 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index b256e71..a57074f 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -528,6 +528,8 @@ class Browser : public TabStripModelDelegate,
//
// After the first call to Show() succeeds, this is set to -1, indicating that
// subsequent calls to Show() should be ignored.
+ // TODO(beng): This should be removed (http://crbug.com/3557) and put into
+ // BrowserView2, or some more likely place.
int initial_show_command_;
class BrowserToolbarModel : public ToolbarModel {
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc
index 70ff11d..5de3d88 100644
--- a/chrome/browser/views/frame/browser_view2.cc
+++ b/chrome/browser/views/frame/browser_view2.cc
@@ -294,7 +294,7 @@ void BrowserView2::Init() {
}
void BrowserView2::Show(int command, bool adjust_to_fit) {
- frame_->GetWindow()->Show();
+ frame_->GetWindow()->Show(command);
}
void BrowserView2::Close() {
diff --git a/chrome/views/window.cc b/chrome/views/window.cc
index c2e2a7e..0eaa599 100644
--- a/chrome/views/window.cc
+++ b/chrome/views/window.cc
@@ -85,7 +85,11 @@ gfx::Size Window::CalculateMaximumSize() const {
}
void Window::Show() {
- ShowWindow(SW_SHOW);
+ Show(SW_SHOW);
+}
+
+void Window::Show(int show_style) {
+ ShowWindow(show_style);
SetInitialFocus();
}
diff --git a/chrome/views/window.h b/chrome/views/window.h
index 7b9c037..533bc27 100644
--- a/chrome/views/window.h
+++ b/chrome/views/window.h
@@ -51,7 +51,8 @@ class Window : public ContainerWin {
gfx::Size CalculateMaximumSize() const;
// Show the window.
- virtual void Show();
+ void Show();
+ void Show(int show_style);
// Activate the window, assuming it already exists and is visible.
void Activate();