summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-17 23:44:49 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-17 23:44:49 +0000
commitf340e881d7059db7284d07ab4cd19d82739212c3 (patch)
treea55c0bbf280297fb86e1e3831693470ae6571173
parentdfcec23417f5ac504a257f1c740404df69826792 (diff)
downloadchromium_src-f340e881d7059db7284d07ab4cd19d82739212c3.zip
chromium_src-f340e881d7059db7284d07ab4cd19d82739212c3.tar.gz
chromium_src-f340e881d7059db7284d07ab4cd19d82739212c3.tar.bz2
Support shortcut show styles for "run maximized", "run minimized" etc.
http://crbug.com/3278 Review URL: http://codereview.chromium.org/7504 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3579 0039d316-1c4b-4281-b951-d872f2087c98
-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();