| 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/gtk_util.h" | 5 #include "chrome/browser/ui/gtk/gtk_util.h" |
| 6 | 6 |
| 7 #include <cairo/cairo.h> | 7 #include <cairo/cairo.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <cstdarg> | 10 #include <cstdarg> |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 return TRUE; | 282 return TRUE; |
| 283 } | 283 } |
| 284 | 284 |
| 285 WebContents* GetBrowserWindowSelectedWebContents(BrowserWindow* window) { | 285 WebContents* GetBrowserWindowSelectedWebContents(BrowserWindow* window) { |
| 286 BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>( | 286 BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>( |
| 287 window); | 287 window); |
| 288 return browser_window->browser()->GetSelectedWebContents(); | 288 return browser_window->browser()->GetSelectedWebContents(); |
| 289 } | 289 } |
| 290 | 290 |
| 291 GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) { | 291 GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) { |
| 292 return gtk_window_get_focus(window->GetNativeHandle()); | 292 return gtk_window_get_focus(window->GetNativeWindow()); |
| 293 } | 293 } |
| 294 | 294 |
| 295 } // namespace | 295 } // namespace |
| 296 | 296 |
| 297 namespace event_utils { | 297 namespace event_utils { |
| 298 | 298 |
| 299 // TODO(shinyak) This function will be removed after refactoring. | 299 // TODO(shinyak) This function will be removed after refactoring. |
| 300 WindowOpenDisposition DispositionFromGdkState(guint state) { | 300 WindowOpenDisposition DispositionFromGdkState(guint state) { |
| 301 int event_flags = EventFlagsFromGdkState(state); | 301 int event_flags = EventFlagsFromGdkState(state); |
| 302 return browser::DispositionFromEventFlags(event_flags); | 302 return browser::DispositionFromEventFlags(event_flags); |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 | 450 |
| 451 void MakeAppModalWindowGroup() { | 451 void MakeAppModalWindowGroup() { |
| 452 // Older versions of GTK+ don't give us gtk_window_group_list() which is what | 452 // Older versions of GTK+ don't give us gtk_window_group_list() which is what |
| 453 // we need to add current non-browser modal dialogs to the list. If | 453 // we need to add current non-browser modal dialogs to the list. If |
| 454 // we have 2.14+ we can do things the correct way. | 454 // we have 2.14+ we can do things the correct way. |
| 455 GtkWindowGroup* window_group = gtk_window_group_new(); | 455 GtkWindowGroup* window_group = gtk_window_group_new(); |
| 456 for (BrowserList::const_iterator it = BrowserList::begin(); | 456 for (BrowserList::const_iterator it = BrowserList::begin(); |
| 457 it != BrowserList::end(); ++it) { | 457 it != BrowserList::end(); ++it) { |
| 458 // List all windows in this current group | 458 // List all windows in this current group |
| 459 GtkWindowGroup* old_group = | 459 GtkWindowGroup* old_group = |
| 460 gtk_window_get_group((*it)->window()->GetNativeHandle()); | 460 gtk_window_get_group((*it)->window()->GetNativeWindow()); |
| 461 | 461 |
| 462 GList* all_windows = gtk_window_group_list_windows(old_group); | 462 GList* all_windows = gtk_window_group_list_windows(old_group); |
| 463 for (GList* window = all_windows; window; window = window->next) { | 463 for (GList* window = all_windows; window; window = window->next) { |
| 464 gtk_window_group_add_window(window_group, GTK_WINDOW(window->data)); | 464 gtk_window_group_add_window(window_group, GTK_WINDOW(window->data)); |
| 465 } | 465 } |
| 466 g_list_free(all_windows); | 466 g_list_free(all_windows); |
| 467 } | 467 } |
| 468 g_object_unref(window_group); | 468 g_object_unref(window_group); |
| 469 } | 469 } |
| 470 | 470 |
| 471 void AppModalDismissedUngroupWindows() { | 471 void AppModalDismissedUngroupWindows() { |
| 472 if (BrowserList::begin() != BrowserList::end()) { | 472 if (BrowserList::begin() != BrowserList::end()) { |
| 473 std::vector<GtkWindow*> transient_windows; | 473 std::vector<GtkWindow*> transient_windows; |
| 474 | 474 |
| 475 // All windows should be part of one big modal group right now. | 475 // All windows should be part of one big modal group right now. |
| 476 GtkWindowGroup* window_group = gtk_window_get_group( | 476 GtkWindowGroup* window_group = gtk_window_get_group( |
| 477 (*BrowserList::begin())->window()->GetNativeHandle()); | 477 (*BrowserList::begin())->window()->GetNativeWindow()); |
| 478 GList* windows = gtk_window_group_list_windows(window_group); | 478 GList* windows = gtk_window_group_list_windows(window_group); |
| 479 | 479 |
| 480 for (GList* item = windows; item; item = item->next) { | 480 for (GList* item = windows; item; item = item->next) { |
| 481 GtkWindow* window = GTK_WINDOW(item->data); | 481 GtkWindow* window = GTK_WINDOW(item->data); |
| 482 GtkWindow* transient_for = gtk_window_get_transient_for(window); | 482 GtkWindow* transient_for = gtk_window_get_transient_for(window); |
| 483 if (transient_for) { | 483 if (transient_for) { |
| 484 transient_windows.push_back(window); | 484 transient_windows.push_back(window); |
| 485 } else { | 485 } else { |
| 486 GtkWindowGroup* window_group = gtk_window_group_new(); | 486 GtkWindowGroup* window_group = gtk_window_group_new(); |
| 487 gtk_window_group_add_window(window_group, window); | 487 gtk_window_group_add_window(window_group, window); |
| (...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1170 | 1170 |
| 1171 void DoCopy(BrowserWindow* window) { | 1171 void DoCopy(BrowserWindow* window) { |
| 1172 DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard"); | 1172 DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard"); |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 void DoPaste(BrowserWindow* window) { | 1175 void DoPaste(BrowserWindow* window) { |
| 1176 DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard"); | 1176 DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard"); |
| 1177 } | 1177 } |
| 1178 | 1178 |
| 1179 } // namespace gtk_util | 1179 } // namespace gtk_util |
| OLD | NEW |