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

Side by Side Diff: content/shell/shell_gtk.cc

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac build failure Created 7 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
« no previous file with comments | « content/shell/shell_browser_main_parts.cc ('k') | content/shell/shell_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "content/shell/shell.h" 5 #include "content/shell/shell.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 "base/logging.h" 10 #include "base/logging.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 GtkWidget* CreateMenuBar(Shell* shell) { 47 GtkWidget* CreateMenuBar(Shell* shell) {
48 GtkWidget* menu_bar = gtk_menu_bar_new(); 48 GtkWidget* menu_bar = gtk_menu_bar_new();
49 GtkWidget* debug_menu = CreateMenu(menu_bar, "Debug"); 49 GtkWidget* debug_menu = CreateMenu(menu_bar, "Debug");
50 AddMenuEntry(debug_menu, "Show web inspector...", 50 AddMenuEntry(debug_menu, "Show web inspector...",
51 G_CALLBACK(ShowWebInspectorActivated), shell); 51 G_CALLBACK(ShowWebInspectorActivated), shell);
52 return menu_bar; 52 return menu_bar;
53 } 53 }
54 54
55 } // namespace 55 } // namespace
56 56
57 void Shell::PlatformInitialize() { 57 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
58 } 58 }
59 59
60 void Shell::PlatformCleanUp() { 60 void Shell::PlatformCleanUp() {
61 // Nothing to clean up; GTK will clean up the widgets shortly after. 61 // Nothing to clean up; GTK will clean up the widgets shortly after.
62 } 62 }
63 63
64 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) { 64 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
65 if (headless_) 65 if (headless_)
66 return; 66 return;
67 67
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 289
290 void Shell::PlatformSetTitle(const string16& title) { 290 void Shell::PlatformSetTitle(const string16& title) {
291 if (headless_) 291 if (headless_)
292 return; 292 return;
293 293
294 std::string title_utf8 = UTF16ToUTF8(title); 294 std::string title_utf8 = UTF16ToUTF8(title);
295 gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str()); 295 gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str());
296 } 296 }
297 297
298 } // namespace content 298 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_browser_main_parts.cc ('k') | content/shell/shell_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698