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

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

Issue 11777028: GTTF: Fix problems with contents detected by debugallocation: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 207 }
208 208
209 void Shell::SizeTo(int width, int height) { 209 void Shell::SizeTo(int width, int height) {
210 content_width_ = width; 210 content_width_ = width;
211 content_height_ = height; 211 content_height_ = height;
212 if (web_contents_.get()) 212 if (web_contents_.get())
213 gtk_widget_set_size_request(web_contents_->GetNativeView(), width, height); 213 gtk_widget_set_size_request(web_contents_->GetNativeView(), width, height);
214 } 214 }
215 215
216 void Shell::PlatformResizeSubViews() { 216 void Shell::PlatformResizeSubViews() {
217 SizeTo(content_width_, content_height_); 217 SizeTo(1000, 600);
jam 2013/01/08 18:00:55 you should check this with whoever wrote the gtk v
218 } 218 }
219 219
220 void Shell::Close() { 220 void Shell::Close() {
221 if (headless_) { 221 if (headless_) {
222 delete this; 222 delete this;
223 return; 223 return;
224 } 224 }
225 225
226 gtk_widget_destroy(GTK_WIDGET(window_)); 226 gtk_widget_destroy(GTK_WIDGET(window_));
227 } 227 }
(...skipping 61 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

Powered by Google App Engine
This is Rietveld 408576698