| 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_window_gtk.h" | 5 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <X11/XF86keysym.h> | 8 #include <X11/XF86keysym.h> |
| 9 | 9 |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 // On Windows, this is used for a performance optimization. | 552 // On Windows, this is used for a performance optimization. |
| 553 // http://code.google.com/p/chromium/issues/detail?id=12291 | 553 // http://code.google.com/p/chromium/issues/detail?id=12291 |
| 554 } | 554 } |
| 555 | 555 |
| 556 void BrowserWindowGtk::UpdateTitleBar() { | 556 void BrowserWindowGtk::UpdateTitleBar() { |
| 557 #if defined(OS_CHROMEOS) | 557 #if defined(OS_CHROMEOS) |
| 558 if (panel_controller_) | 558 if (panel_controller_) |
| 559 panel_controller_->UpdateTitleBar(); | 559 panel_controller_->UpdateTitleBar(); |
| 560 #endif | 560 #endif |
| 561 | 561 |
| 562 std::wstring title = browser_->GetCurrentPageTitle(); | 562 string16 title = browser_->GetCurrentPageTitle(); |
| 563 gtk_window_set_title(window_, WideToUTF8(title).c_str()); | 563 gtk_window_set_title(window_, UTF16ToUTF8(title).c_str()); |
| 564 if (ShouldShowWindowIcon()) { | 564 if (ShouldShowWindowIcon()) { |
| 565 // TODO(tc): If we're showing a title bar, we should update the app icon. | 565 // TODO(tc): If we're showing a title bar, we should update the app icon. |
| 566 } | 566 } |
| 567 } | 567 } |
| 568 | 568 |
| 569 void BrowserWindowGtk::UpdateDevTools() { | 569 void BrowserWindowGtk::UpdateDevTools() { |
| 570 NOTIMPLEMENTED(); | 570 NOTIMPLEMENTED(); |
| 571 } | 571 } |
| 572 | 572 |
| 573 void BrowserWindowGtk::UpdateLoadingAnimations(bool should_animate) { | 573 void BrowserWindowGtk::UpdateLoadingAnimations(bool should_animate) { |
| (...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1395 *edge = GDK_WINDOW_EDGE_NORTH_EAST; | 1395 *edge = GDK_WINDOW_EDGE_NORTH_EAST; |
| 1396 } else if (y < bounds_.height() - kResizeAreaCornerSize) { | 1396 } else if (y < bounds_.height() - kResizeAreaCornerSize) { |
| 1397 *edge = GDK_WINDOW_EDGE_EAST; | 1397 *edge = GDK_WINDOW_EDGE_EAST; |
| 1398 } else { | 1398 } else { |
| 1399 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; | 1399 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; |
| 1400 } | 1400 } |
| 1401 return true; | 1401 return true; |
| 1402 } | 1402 } |
| 1403 NOTREACHED(); | 1403 NOTREACHED(); |
| 1404 } | 1404 } |
| OLD | NEW |