diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 23:48:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 23:48:28 +0000 |
| commit | 871c8b7558f8581a80394418f34f8d062e7632bd (patch) | |
| tree | a2e75ffcdd4d02a41c97e69379b0024243867701 /chrome/browser/chromeos | |
| parent | 7f5bd03bc0c37fa3398f8cdd42453230e384cee5 (diff) | |
| download | chromium_src-871c8b7558f8581a80394418f34f8d062e7632bd.zip chromium_src-871c8b7558f8581a80394418f34f8d062e7632bd.tar.gz chromium_src-871c8b7558f8581a80394418f34f8d062e7632bd.tar.bz2 | |
Use saved bounds when --chromeos-frame is specified.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2825002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/frame/browser_view.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index 7c954db..c03141a 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -10,6 +10,7 @@ #include "app/menus/simple_menu_model.h" #include "app/theme_provider.h" +#include "base/command_line.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/chromeos/compact_location_bar_host.h" #include "chrome/browser/chromeos/compact_navigation_bar.h" @@ -30,6 +31,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/browser/views/theme_background.h" #include "chrome/browser/views/toolbar_view.h" +#include "chrome/common/chrome_switches.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -515,7 +517,8 @@ void BrowserView::ChildPreferredSizeChanged(View* child) { } bool BrowserView::GetSavedWindowBounds(gfx::Rect* bounds) const { - if ((browser()->type() & Browser::TYPE_POPUP) == 0) { + if ((browser()->type() & Browser::TYPE_POPUP) == 0 && + !CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame)) { // Typically we don't request a full screen size. This means we'll request a // non-full screen size, layout/paint at that size, then the window manager // will snap us to full screen size. This results in an ugly |