Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(886)

Unified Diff: chrome/browser/chromeos/frame/panel_controller.cc

Issue 7945014: Applied review comments from oshima for CL 7850026. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/frame/panel_controller.cc
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index 1f9d97f6464d23581493b57ad4fc86e062d9de50..cf3c1c1c33fcd8bdbfbc0354fec15b5c9d39eeff 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -179,9 +179,6 @@ void PanelController::Init(bool initial_focus,
const gfx::Rect& window_bounds,
XID creator_xid,
WmIpcPanelUserResizeType resize_type) {
-#if defined(USE_AURA)
- // TODO(saintlou): Need PureView for panels.
-#else
gfx::Rect title_bounds(0, 0, window_bounds.width(), kTitleHeight);
title_window_ = new views::Widget;
@@ -190,6 +187,8 @@ void PanelController::Init(bool initial_focus,
params.transparent = true;
params.bounds = title_bounds;
title_window_->Init(params);
+
+#if !defined(USE_AURA)
gtk_widget_set_size_request(title_window_->GetNativeView(),
title_bounds.width(), title_bounds.height());
title_ = title_window_->GetNativeView();
@@ -212,12 +211,12 @@ void PanelController::Init(bool initial_focus,
client_event_handler_id_ = g_signal_connect(
panel_, "client-event", G_CALLBACK(OnPanelClientEvent), this);
+#endif // !USE_AURA
title_content_ = new TitleContentView(this);
title_window_->SetContentsView(title_content_);
UpdateTitleBar();
title_window_->Show();
-#endif
}
void PanelController::UpdateTitleBar() {
« no previous file with comments | « chrome/browser/chromeos/frame/panel_browser_view.cc ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698