| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/browser_window_gtk.h" | 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 return NULL; | 726 return NULL; |
| 727 } | 727 } |
| 728 | 728 |
| 729 StatusBubble* BrowserWindowGtk::GetStatusBubble() { | 729 StatusBubble* BrowserWindowGtk::GetStatusBubble() { |
| 730 return status_bubble_.get(); | 730 return status_bubble_.get(); |
| 731 } | 731 } |
| 732 | 732 |
| 733 void BrowserWindowGtk::UpdateTitleBar() { | 733 void BrowserWindowGtk::UpdateTitleBar() { |
| 734 TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::UpdateTitleBar"); | 734 TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::UpdateTitleBar"); |
| 735 base::string16 title = browser_->GetWindowTitleForCurrentTab(); | 735 base::string16 title = browser_->GetWindowTitleForCurrentTab(); |
| 736 gtk_window_set_title(window_, UTF16ToUTF8(title).c_str()); | 736 gtk_window_set_title(window_, base::UTF16ToUTF8(title).c_str()); |
| 737 if (ShouldShowWindowIcon()) | 737 if (ShouldShowWindowIcon()) |
| 738 titlebar_->UpdateTitleAndIcon(); | 738 titlebar_->UpdateTitleAndIcon(); |
| 739 } | 739 } |
| 740 | 740 |
| 741 void BrowserWindowGtk::BookmarkBarStateChanged( | 741 void BrowserWindowGtk::BookmarkBarStateChanged( |
| 742 BookmarkBar::AnimateChangeType change_type) { | 742 BookmarkBar::AnimateChangeType change_type) { |
| 743 MaybeShowBookmarkBar(change_type == BookmarkBar::ANIMATE_STATE_CHANGE); | 743 MaybeShowBookmarkBar(change_type == BookmarkBar::ANIMATE_STATE_CHANGE); |
| 744 } | 744 } |
| 745 | 745 |
| 746 void BrowserWindowGtk::UpdateDevTools() { | 746 void BrowserWindowGtk::UpdateDevTools() { |
| (...skipping 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2361 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2361 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
| 2362 browser_window_gtk->Init(); | 2362 browser_window_gtk->Init(); |
| 2363 return browser_window_gtk; | 2363 return browser_window_gtk; |
| 2364 } | 2364 } |
| 2365 | 2365 |
| 2366 // static | 2366 // static |
| 2367 chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType( | 2367 chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType( |
| 2368 chrome::HostDesktopType desktop_type) { | 2368 chrome::HostDesktopType desktop_type) { |
| 2369 return desktop_type; | 2369 return desktop_type; |
| 2370 } | 2370 } |
| OLD | NEW |