Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(954)

Side by Side Diff: chrome/browser/ui/gtk/browser_titlebar.cc

Issue 8985008: Don't use browser windows for platform app shell windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable platform app tests on non-GTK platforms. Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 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>
11 #include <vector> 11 #include <vector>
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon); 620 GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
621 gtk_window_set_icon(window_, icon_pixbuf); 621 gtk_window_set_icon(window_, icon_pixbuf);
622 g_object_unref(icon_pixbuf); 622 g_object_unref(icon_pixbuf);
623 } 623 }
624 break; 624 break;
625 } 625 }
626 case Browser::TYPE_TABBED: { 626 case Browser::TYPE_TABBED: {
627 NOTREACHED() << "We should never have a tabbed app window."; 627 NOTREACHED() << "We should never have a tabbed app window.";
628 break; 628 break;
629 } 629 }
630 case Browser::TYPE_SHELL: {
631 // Shell windows don't show titles and icons for now.
632 break;
633 }
634 case Browser::TYPE_PANEL: { 630 case Browser::TYPE_PANEL: {
635 break; 631 break;
636 } 632 }
637 } 633 }
638 } 634 }
639 } 635 }
640 636
641 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) { 637 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) {
642 DCHECK(app_mode_favicon_); 638 DCHECK(app_mode_favicon_);
643 639
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 ui::SimpleMenuModel::Delegate* delegate) 1139 ui::SimpleMenuModel::Delegate* delegate)
1144 : SimpleMenuModel(delegate) { 1140 : SimpleMenuModel(delegate) {
1145 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); 1141 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
1146 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); 1142 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
1147 AddSeparator(); 1143 AddSeparator();
1148 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); 1144 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
1149 AddSeparator(); 1145 AddSeparator();
1150 AddCheckItemWithStringId(kShowWindowDecorationsCommand, 1146 AddCheckItemWithStringId(kShowWindowDecorationsCommand,
1151 IDS_SHOW_WINDOW_DECORATIONS_MENU); 1147 IDS_SHOW_WINDOW_DECORATIONS_MENU);
1152 } 1148 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/shell_window.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698