summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/frame/panel_controller.cc
diff options
context:
space:
mode:
authordhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 23:01:20 +0000
committerdhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 23:01:20 +0000
commit93a58bf71562d84d4c8d6b05c18c8ffdfbdeada1 (patch)
tree631688362e7d53c37baa71cf3dc4ed1a31960c76 /chrome/browser/chromeos/frame/panel_controller.cc
parent485e05f8951cddaa6caf374b80987ec437dbb125 (diff)
downloadchromium_src-93a58bf71562d84d4c8d6b05c18c8ffdfbdeada1.zip
chromium_src-93a58bf71562d84d4c8d6b05c18c8ffdfbdeada1.tar.gz
chromium_src-93a58bf71562d84d4c8d6b05c18c8ffdfbdeada1.tar.bz2
Adding reporting of parent browser's id, so that we can open up next to that browser if wanted.
BUG=chromium-os:3711 TEST=none Review URL: http://codereview.chromium.org/2640002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/frame/panel_controller.cc')
-rw-r--r--chrome/browser/chromeos/frame/panel_controller.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index 1c0aa1c..7d0e5f3 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -7,7 +7,6 @@
#include <vector>
#include "app/resource_bundle.h"
-#include "app/x11_util.h"
#include "base/logging.h"
#include "base/singleton.h"
#include "base/scoped_ptr.h"
@@ -89,7 +88,9 @@ PanelController::PanelController(Delegate* delegate,
client_event_handler_id_(0) {
}
-void PanelController::Init(bool initial_focus, const gfx::Rect& window_bounds) {
+void PanelController::Init(bool initial_focus,
+ const gfx::Rect& window_bounds,
+ XID creator_xid) {
gfx::Rect title_bounds(
0, 0, window_bounds.width(), kTitleHeight);
@@ -108,6 +109,7 @@ void PanelController::Init(bool initial_focus, const gfx::Rect& window_bounds) {
type_params.push_back(title_xid_);
type_params.push_back(expanded_ ? 1 : 0);
type_params.push_back(initial_focus ? 1 : 0);
+ type_params.push_back(creator_xid);
WmIpc::instance()->SetWindowType(
GTK_WIDGET(panel_),
WM_IPC_WINDOW_CHROME_PANEL_CONTENT,