OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
617 GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon); | 617 GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon); |
618 gtk_window_set_icon(window_, icon_pixbuf); | 618 gtk_window_set_icon(window_, icon_pixbuf); |
619 g_object_unref(icon_pixbuf); | 619 g_object_unref(icon_pixbuf); |
620 } | 620 } |
621 break; | 621 break; |
622 } | 622 } |
623 case Browser::TYPE_TABBED: { | 623 case Browser::TYPE_TABBED: { |
624 NOTREACHED() << "We should never have a tabbed app window."; | 624 NOTREACHED() << "We should never have a tabbed app window."; |
625 break; | 625 break; |
626 } | 626 } |
| 627 case Browser::TYPE_SHELL: { |
| 628 // Shell windows don't show titles and icons for now. |
| 629 break; |
| 630 } |
627 case Browser::TYPE_PANEL: { | 631 case Browser::TYPE_PANEL: { |
628 break; | 632 break; |
629 } | 633 } |
630 } | 634 } |
631 } | 635 } |
632 } | 636 } |
633 | 637 |
634 void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) { | 638 void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) { |
635 DCHECK(app_mode_favicon_); | 639 DCHECK(app_mode_favicon_); |
636 | 640 |
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1133 ui::SimpleMenuModel::Delegate* delegate) | 1137 ui::SimpleMenuModel::Delegate* delegate) |
1134 : SimpleMenuModel(delegate) { | 1138 : SimpleMenuModel(delegate) { |
1135 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); | 1139 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); |
1136 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); | 1140 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); |
1137 AddSeparator(); | 1141 AddSeparator(); |
1138 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); | 1142 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); |
1139 AddSeparator(); | 1143 AddSeparator(); |
1140 AddCheckItemWithStringId(kShowWindowDecorationsCommand, | 1144 AddCheckItemWithStringId(kShowWindowDecorationsCommand, |
1141 IDS_SHOW_WINDOW_DECORATIONS_MENU); | 1145 IDS_SHOW_WINDOW_DECORATIONS_MENU); |
1142 } | 1146 } |
OLD | NEW |