| 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/browser_titlebar.h" | 5 #include "chrome/browser/ui/gtk/browser_titlebar.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 gtk_util::SetWindowIcon(window_, profile); | 606 gtk_util::SetWindowIcon(window_, profile); |
| 607 } else { | 607 } else { |
| 608 gtk_util::SetWindowIcon(window_, profile, icon.ToGdkPixbuf()); | 608 gtk_util::SetWindowIcon(window_, profile, icon.ToGdkPixbuf()); |
| 609 } | 609 } |
| 610 break; | 610 break; |
| 611 } | 611 } |
| 612 case Browser::TYPE_TABBED: { | 612 case Browser::TYPE_TABBED: { |
| 613 NOTREACHED() << "We should never have a tabbed app window."; | 613 NOTREACHED() << "We should never have a tabbed app window."; |
| 614 break; | 614 break; |
| 615 } | 615 } |
| 616 case Browser::TYPE_PANEL: { | |
| 617 NOTREACHED(); | |
| 618 break; | |
| 619 } | |
| 620 } | 616 } |
| 621 } | 617 } |
| 622 } | 618 } |
| 623 | 619 |
| 624 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) { | 620 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) { |
| 625 DCHECK(app_mode_favicon_); | 621 DCHECK(app_mode_favicon_); |
| 626 | 622 |
| 627 if (web_contents && web_contents->IsLoading()) { | 623 if (web_contents && web_contents->IsLoading()) { |
| 628 GdkPixbuf* icon_pixbuf = | 624 GdkPixbuf* icon_pixbuf = |
| 629 throbber_.GetNextFrame(web_contents->IsWaitingForResponse()); | 625 throbber_.GetNextFrame(web_contents->IsWaitingForResponse()); |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1034 ui::SimpleMenuModel::Delegate* delegate) | 1030 ui::SimpleMenuModel::Delegate* delegate) |
| 1035 : SimpleMenuModel(delegate) { | 1031 : SimpleMenuModel(delegate) { |
| 1036 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); | 1032 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); |
| 1037 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 1033 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
| 1038 AddSeparator(ui::NORMAL_SEPARATOR); | 1034 AddSeparator(ui::NORMAL_SEPARATOR); |
| 1039 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 1035 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
| 1040 AddSeparator(ui::NORMAL_SEPARATOR); | 1036 AddSeparator(ui::NORMAL_SEPARATOR); |
| 1041 AddCheckItemWithStringId(kShowWindowDecorationsCommand, | 1037 AddCheckItemWithStringId(kShowWindowDecorationsCommand, |
| 1042 IDS_SHOW_WINDOW_DECORATIONS_MENU); | 1038 IDS_SHOW_WINDOW_DECORATIONS_MENU); |
| 1043 } | 1039 } |
| OLD | NEW |