| OLD | NEW | 
|    1 // Copyright 2013 The Chromium Authors. All rights reserved. |    1 // Copyright 2013 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/apps/native_app_window_gtk.h" |    5 #include "chrome/browser/ui/gtk/apps/native_app_window_gtk.h" | 
|    6  |    6  | 
|    7 #include <gdk/gdkx.h> |    7 #include <gdk/gdkx.h> | 
|    8 #include <vector> |    8 #include <vector> | 
|    9  |    9  | 
|   10 #include "base/message_loop/message_pump_gtk.h" |   10 #include "base/message_loop/message_pump_gtk.h" | 
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  627   Profile* profile = shell_window_->profile(); |  627   Profile* profile = shell_window_->profile(); | 
|  628   gfx::Image app_icon = shell_window_->app_icon(); |  628   gfx::Image app_icon = shell_window_->app_icon(); | 
|  629   if (!app_icon.IsEmpty()) |  629   if (!app_icon.IsEmpty()) | 
|  630     gtk_util::SetWindowIcon(window_, profile, app_icon.ToGdkPixbuf()); |  630     gtk_util::SetWindowIcon(window_, profile, app_icon.ToGdkPixbuf()); | 
|  631   else |  631   else | 
|  632     gtk_util::SetWindowIcon(window_, profile); |  632     gtk_util::SetWindowIcon(window_, profile); | 
|  633 } |  633 } | 
|  634  |  634  | 
|  635 void NativeAppWindowGtk::UpdateWindowTitle() { |  635 void NativeAppWindowGtk::UpdateWindowTitle() { | 
|  636   base::string16 title = shell_window_->GetTitle(); |  636   base::string16 title = shell_window_->GetTitle(); | 
|  637   gtk_window_set_title(window_, UTF16ToUTF8(title).c_str()); |  637   gtk_window_set_title(window_, base::UTF16ToUTF8(title).c_str()); | 
|  638 } |  638 } | 
|  639  |  639  | 
|  640 void NativeAppWindowGtk::UpdateDraggableRegions( |  640 void NativeAppWindowGtk::UpdateDraggableRegions( | 
|  641     const std::vector<extensions::DraggableRegion>& regions) { |  641     const std::vector<extensions::DraggableRegion>& regions) { | 
|  642   // Draggable region is not supported for non-frameless window. |  642   // Draggable region is not supported for non-frameless window. | 
|  643   if (!frameless_) |  643   if (!frameless_) | 
|  644     return; |  644     return; | 
|  645  |  645  | 
|  646   draggable_region_.reset(ShellWindow::RawDraggableRegionsToSkRegion(regions)); |  646   draggable_region_.reset(ShellWindow::RawDraggableRegionsToSkRegion(regions)); | 
|  647 } |  647 } | 
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  711     hints_mask |= GDK_HINT_MAX_SIZE; |  711     hints_mask |= GDK_HINT_MAX_SIZE; | 
|  712   } |  712   } | 
|  713   if (hints_mask) { |  713   if (hints_mask) { | 
|  714     gtk_window_set_geometry_hints( |  714     gtk_window_set_geometry_hints( | 
|  715         window_, |  715         window_, | 
|  716         GTK_WIDGET(window_), |  716         GTK_WIDGET(window_), | 
|  717         &hints, |  717         &hints, | 
|  718         static_cast<GdkWindowHints>(hints_mask)); |  718         static_cast<GdkWindowHints>(hints_mask)); | 
|  719   } |  719   } | 
|  720 } |  720 } | 
| OLD | NEW |