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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
577 // On Windows, this is used for a performance optimization. | 577 // On Windows, this is used for a performance optimization. |
578 // http://code.google.com/p/chromium/issues/detail?id=12291 | 578 // http://code.google.com/p/chromium/issues/detail?id=12291 |
579 } | 579 } |
580 | 580 |
581 void BrowserWindowGtk::UpdateTitleBar() { | 581 void BrowserWindowGtk::UpdateTitleBar() { |
582 #if defined(OS_CHROMEOS) | 582 #if defined(OS_CHROMEOS) |
583 if (panel_controller_) | 583 if (panel_controller_) |
584 panel_controller_->UpdateTitleBar(); | 584 panel_controller_->UpdateTitleBar(); |
585 #endif | 585 #endif |
586 | 586 |
587 string16 title = browser_->GetCurrentPageTitle(); | 587 string16 title = browser_->GetWindowTitleForCurrentTab(); |
588 gtk_window_set_title(window_, UTF16ToUTF8(title).c_str()); | 588 gtk_window_set_title(window_, UTF16ToUTF8(title).c_str()); |
589 if (ShouldShowWindowIcon()) { | 589 if (ShouldShowWindowIcon()) { |
590 // TODO(tc): If we're showing a title bar, we should update the app icon. | 590 // TODO(tc): If we're showing a title bar, we should update the app icon. |
591 } | 591 } |
592 } | 592 } |
593 | 593 |
594 void BrowserWindowGtk::UpdateDevTools() { | 594 void BrowserWindowGtk::UpdateDevTools() { |
595 NOTIMPLEMENTED(); | 595 NOTIMPLEMENTED(); |
596 } | 596 } |
597 | 597 |
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1449 *edge = GDK_WINDOW_EDGE_NORTH_EAST; | 1449 *edge = GDK_WINDOW_EDGE_NORTH_EAST; |
1450 } else if (y < bounds_.height() - kResizeAreaCornerSize) { | 1450 } else if (y < bounds_.height() - kResizeAreaCornerSize) { |
1451 *edge = GDK_WINDOW_EDGE_EAST; | 1451 *edge = GDK_WINDOW_EDGE_EAST; |
1452 } else { | 1452 } else { |
1453 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; | 1453 *edge = GDK_WINDOW_EDGE_SOUTH_EAST; |
1454 } | 1454 } |
1455 return true; | 1455 return true; |
1456 } | 1456 } |
1457 NOTREACHED(); | 1457 NOTREACHED(); |
1458 } | 1458 } |
OLD | NEW |