summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/frame/browser_frame_chromeos.cc')
-rw-r--r--chrome/browser/chromeos/frame/browser_frame_chromeos.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
index f403694..690956a 100644
--- a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
+++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -31,7 +31,8 @@ BrowserFrameChromeos::~BrowserFrameChromeos() {
void BrowserFrameChromeos::InitBrowserFrame() {
BrowserFrameGtk::InitBrowserFrame();
- if (!browser_view()->IsBrowserTypePopup()) {
+ if (!browser_view()->IsBrowserTypePopup() &&
+ !browser_view()->IsBrowserTypePanel()) {
// On chromeos we want windows to always render as active.
DisableInactiveRendering();
}
@@ -40,8 +41,9 @@ void BrowserFrameChromeos::InitBrowserFrame() {
bool BrowserFrameChromeos::IsMaximized() const {
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame))
return WindowGtk::IsMaximized();
- bool is_popup = browser_view()->IsBrowserTypePopup();
- return !IsFullscreen() && (!is_popup || WindowGtk::IsMaximized());
+ bool is_popup_or_panel = browser_view()->IsBrowserTypePopup() ||
+ browser_view()->IsBrowserTypePanel();
+ return !IsFullscreen() && (!is_popup_or_panel || WindowGtk::IsMaximized());
}
} // namespace chromeos