| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/gtk/browser_toolbar_gtk.h" | 5 #include "chrome/browser/gtk/browser_toolbar_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/base_paths_linux.h" | 10 #include "base/base_paths_linux.h" |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0); | 263 gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0); |
| 264 | 264 |
| 265 return button; | 265 return button; |
| 266 } | 266 } |
| 267 | 267 |
| 268 // static | 268 // static |
| 269 gboolean BrowserToolbarGtk::OnContentAreaExpose(GtkWidget* widget, | 269 gboolean BrowserToolbarGtk::OnContentAreaExpose(GtkWidget* widget, |
| 270 GdkEventExpose* e, | 270 GdkEventExpose* e, |
| 271 BrowserToolbarGtk* toolbar) { | 271 BrowserToolbarGtk* toolbar) { |
| 272 toolbar->background_ninebox_.get()->RenderTopCenterStrip(widget, | 272 toolbar->background_ninebox_.get()->RenderTopCenterStrip(widget, |
| 273 0, widget->allocation.width); | 273 0, widget->allocation.width, -2); |
| 274 |
| 274 return FALSE; // Allow subwidgets to paint. | 275 return FALSE; // Allow subwidgets to paint. |
| 275 } | 276 } |
| 276 | 277 |
| 277 // static | 278 // static |
| 278 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button, | 279 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button, |
| 279 BrowserToolbarGtk* toolbar) { | 280 BrowserToolbarGtk* toolbar) { |
| 280 int tag = -1; | 281 int tag = -1; |
| 281 if (button == toolbar->back_->widget()) | 282 if (button == toolbar->back_->widget()) |
| 282 tag = IDC_BACK; | 283 tag = IDC_BACK; |
| 283 else if (button == toolbar->forward_->widget()) | 284 else if (button == toolbar->forward_->widget()) |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 rb.LoadPixbuf(IDR_CONTENT_TOP_RIGHT_CORNER), | 405 rb.LoadPixbuf(IDR_CONTENT_TOP_RIGHT_CORNER), |
| 405 rb.LoadPixbuf(IDR_CONTENT_LEFT_SIDE), | 406 rb.LoadPixbuf(IDR_CONTENT_LEFT_SIDE), |
| 406 NULL, | 407 NULL, |
| 407 rb.LoadPixbuf(IDR_CONTENT_RIGHT_SIDE), | 408 rb.LoadPixbuf(IDR_CONTENT_RIGHT_SIDE), |
| 408 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_LEFT_CORNER), | 409 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_LEFT_CORNER), |
| 409 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_CENTER), | 410 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_CENTER), |
| 410 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_RIGHT_CORNER) | 411 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_RIGHT_CORNER) |
| 411 }; | 412 }; |
| 412 background_ninebox_.reset(new NineBox(images)); | 413 background_ninebox_.reset(new NineBox(images)); |
| 413 } | 414 } |
| OLD | NEW |