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/bookmark_bubble_gtk.h" | 5 #include "chrome/browser/gtk/bookmark_bubble_gtk.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 gtk_container_set_focus_child(GTK_CONTAINER(content), table); | 222 gtk_container_set_focus_child(GTK_CONTAINER(content), table); |
223 | 223 |
224 InfoBubbleGtk::ArrowLocationGtk arrow_location = | 224 InfoBubbleGtk::ArrowLocationGtk arrow_location = |
225 !base::i18n::IsRTL() ? | 225 !base::i18n::IsRTL() ? |
226 InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT : | 226 InfoBubbleGtk::ARROW_LOCATION_TOP_LEFT : |
227 InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT; | 227 InfoBubbleGtk::ARROW_LOCATION_TOP_RIGHT; |
228 bubble_ = InfoBubbleGtk::Show(toplevel_window_, | 228 bubble_ = InfoBubbleGtk::Show(toplevel_window_, |
229 rect, | 229 rect, |
230 content, | 230 content, |
231 arrow_location, | 231 arrow_location, |
232 true, | 232 true, // match_system_theme |
| 233 true, // grab_input |
233 theme_provider_, | 234 theme_provider_, |
234 this); // delegate | 235 this); // delegate |
235 if (!bubble_) { | 236 if (!bubble_) { |
236 NOTREACHED(); | 237 NOTREACHED(); |
237 return; | 238 return; |
238 } | 239 } |
239 | 240 |
240 g_signal_connect(content, "destroy", | 241 g_signal_connect(content, "destroy", |
241 G_CALLBACK(&OnDestroyThunk), this); | 242 G_CALLBACK(&OnDestroyThunk), this); |
242 g_signal_connect(name_entry_, "activate", | 243 g_signal_connect(name_entry_, "activate", |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 | 383 |
383 // Close the bubble, deleting the C++ objects, etc. | 384 // Close the bubble, deleting the C++ objects, etc. |
384 bubble_->Close(); | 385 bubble_->Close(); |
385 | 386 |
386 if (node) { | 387 if (node) { |
387 BookmarkEditor::Show(toplevel, profile, NULL, | 388 BookmarkEditor::Show(toplevel, profile, NULL, |
388 BookmarkEditor::EditDetails(node), | 389 BookmarkEditor::EditDetails(node), |
389 BookmarkEditor::SHOW_TREE, NULL); | 390 BookmarkEditor::SHOW_TREE, NULL); |
390 } | 391 } |
391 } | 392 } |
OLD | NEW |