| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/gtk/browser_toolbar_gtk.h" | 5 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #include <X11/XF86keysym.h> | 9 #include <X11/XF86keysym.h> |
| 10 | 10 |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 // BrowserToolbarGtk, public --------------------------------------------------- | 421 // BrowserToolbarGtk, public --------------------------------------------------- |
| 422 | 422 |
| 423 void BrowserToolbarGtk::UpdateWebContents(WebContents* contents, | 423 void BrowserToolbarGtk::UpdateWebContents(WebContents* contents, |
| 424 bool should_restore_state) { | 424 bool should_restore_state) { |
| 425 location_bar_->Update(should_restore_state ? contents : NULL); | 425 location_bar_->Update(should_restore_state ? contents : NULL); |
| 426 | 426 |
| 427 if (actions_toolbar_.get()) | 427 if (actions_toolbar_.get()) |
| 428 actions_toolbar_->Update(); | 428 actions_toolbar_->Update(); |
| 429 } | 429 } |
| 430 | 430 |
| 431 bool BrowserToolbarGtk::IsWrenchMenuShowing() const { |
| 432 return wrench_menu_.get() && gtk_widget_get_visible(wrench_menu_->widget()); |
| 433 } |
| 434 |
| 431 // BrowserToolbarGtk, private -------------------------------------------------- | 435 // BrowserToolbarGtk, private -------------------------------------------------- |
| 432 | 436 |
| 433 void BrowserToolbarGtk::SetUpDragForHomeButton(bool enable) { | 437 void BrowserToolbarGtk::SetUpDragForHomeButton(bool enable) { |
| 434 if (enable) { | 438 if (enable) { |
| 435 gtk_drag_dest_set(home_->widget(), GTK_DEST_DEFAULT_ALL, | 439 gtk_drag_dest_set(home_->widget(), GTK_DEST_DEFAULT_ALL, |
| 436 NULL, 0, GDK_ACTION_COPY); | 440 NULL, 0, GDK_ACTION_COPY); |
| 437 static const int targets[] = { ui::TEXT_PLAIN, ui::TEXT_URI_LIST, -1 }; | 441 static const int targets[] = { ui::TEXT_PLAIN, ui::TEXT_URI_LIST, -1 }; |
| 438 ui::SetDestTargetList(home_->widget(), targets); | 442 ui::SetDestTargetList(home_->widget(), targets); |
| 439 | 443 |
| 440 drop_handler_.reset(new ui::GtkSignalRegistrar()); | 444 drop_handler_.reset(new ui::GtkSignalRegistrar()); |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 const SkBitmap* badge = theme_service_->GetBitmapNamed(resource_id); | 690 const SkBitmap* badge = theme_service_->GetBitmapNamed(resource_id); |
| 687 gfx::CanvasSkiaPaint canvas(expose, false); | 691 gfx::CanvasSkiaPaint canvas(expose, false); |
| 688 int x_offset = base::i18n::IsRTL() ? 0 : allocation.width - badge->width(); | 692 int x_offset = base::i18n::IsRTL() ? 0 : allocation.width - badge->width(); |
| 689 int y_offset = 0; | 693 int y_offset = 0; |
| 690 canvas.DrawImageInt(*badge, | 694 canvas.DrawImageInt(*badge, |
| 691 allocation.x + x_offset, | 695 allocation.x + x_offset, |
| 692 allocation.y + y_offset); | 696 allocation.y + y_offset); |
| 693 | 697 |
| 694 return FALSE; | 698 return FALSE; |
| 695 } | 699 } |
| OLD | NEW |