summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-15 01:27:06 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-15 01:27:06 +0000
commited5db9a0097ede07ee9703b73eb1bb72b6851a83 (patch)
tree19f18441e5f1264019de4d8d26b083540b1891ea /chrome
parent8fdf9393524a480a666d310ef7b5c1ece202dc83 (diff)
downloadchromium_src-ed5db9a0097ede07ee9703b73eb1bb72b6851a83.zip
chromium_src-ed5db9a0097ede07ee9703b73eb1bb72b6851a83.tar.gz
chromium_src-ed5db9a0097ede07ee9703b73eb1bb72b6851a83.tar.bz2
Make popups opened from app mode windows use the system frame.
BUG=23368 Review URL: http://codereview.chromium.org/596081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 7dc5431..9a0a4db 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1999,9 +1999,10 @@ bool BrowserWindowGtk::GetWindowEdge(int x, int y, GdkWindowEdge* edge) {
}
bool BrowserWindowGtk::UseCustomFrame() {
- // We don't use the custom frame for app mode windows.
+ // We don't use the custom frame for app mode windows or app window popups.
return use_custom_frame_pref_.GetValue() &&
- (browser_->type() != Browser::TYPE_APP);
+ browser_->type() != Browser::TYPE_APP &&
+ browser_->type() != Browser::TYPE_APP_POPUP;
}
void BrowserWindowGtk::PlaceBookmarkBar(bool is_floating) {