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

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

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « content/shell/browser/shell_aura.cc ('k') | content/shell/browser/shell_javascript_dialog.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/shell.h" 5 #include "content/shell/browser/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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 } 328 }
329 329
330 gboolean Shell::OnReloadKeyPressed(GtkAccelGroup* accel_group, 330 gboolean Shell::OnReloadKeyPressed(GtkAccelGroup* accel_group,
331 GObject* acceleratable, 331 GObject* acceleratable,
332 guint keyval, 332 guint keyval,
333 GdkModifierType modifier) { 333 GdkModifierType modifier) {
334 Reload(); 334 Reload();
335 return TRUE; 335 return TRUE;
336 } 336 }
337 337
338 void Shell::PlatformSetTitle(const string16& title) { 338 void Shell::PlatformSetTitle(const base::string16& title) {
339 if (headless_) 339 if (headless_)
340 return; 340 return;
341 341
342 std::string title_utf8 = UTF16ToUTF8(title); 342 std::string title_utf8 = UTF16ToUTF8(title);
343 gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str()); 343 gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str());
344 } 344 }
345 345
346 } // namespace content 346 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_aura.cc ('k') | content/shell/browser/shell_javascript_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698