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

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

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 "chrome/browser/ui/gtk/gtk_util.h" 5 #include "chrome/browser/ui/gtk/gtk_util.h"
6 6
7 #include <cairo/cairo.h> 7 #include <cairo/cairo.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <cstdarg> 10 #include <cstdarg>
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 gtk_window_get_position(GTK_WINDOW(dialog), &x, &y); 939 gtk_window_get_position(GTK_WINDOW(dialog), &x, &y);
940 gtk_window_get_size(GTK_WINDOW(dialog), &width, &height); 940 gtk_window_get_size(GTK_WINDOW(dialog), &width, &height);
941 941
942 return gfx::Rect(x, y, width, height); 942 return gfx::Rect(x, y, width, height);
943 } 943 }
944 944
945 base::string16 GetStockPreferencesMenuLabel() { 945 base::string16 GetStockPreferencesMenuLabel() {
946 GtkStockItem stock_item; 946 GtkStockItem stock_item;
947 base::string16 preferences; 947 base::string16 preferences;
948 if (gtk_stock_lookup(GTK_STOCK_PREFERENCES, &stock_item)) { 948 if (gtk_stock_lookup(GTK_STOCK_PREFERENCES, &stock_item)) {
949 const char16 kUnderscore[] = { '_', 0 }; 949 const base::char16 kUnderscore[] = { '_', 0 };
950 base::RemoveChars(base::UTF8ToUTF16(stock_item.label), 950 base::RemoveChars(base::UTF8ToUTF16(stock_item.label),
951 kUnderscore, &preferences); 951 kUnderscore, &preferences);
952 } 952 }
953 return preferences; 953 return preferences;
954 } 954 }
955 955
956 bool IsWidgetAncestryVisible(GtkWidget* widget) { 956 bool IsWidgetAncestryVisible(GtkWidget* widget) {
957 GtkWidget* parent = widget; 957 GtkWidget* parent = widget;
958 while (parent && gtk_widget_get_visible(parent)) 958 while (parent && gtk_widget_get_visible(parent))
959 parent = gtk_widget_get_parent(parent); 959 parent = gtk_widget_get_parent(parent);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 if (gtk_window_get_modal(GTK_WINDOW(dialog))) { 993 if (gtk_window_get_modal(GTK_WINDOW(dialog))) {
994 // Work around a KDE 3 window manager bug. 994 // Work around a KDE 3 window manager bug.
995 scoped_ptr<base::Environment> env(base::Environment::Create()); 995 scoped_ptr<base::Environment> env(base::Environment::Create());
996 if (base::nix::DESKTOP_ENVIRONMENT_KDE3 == 996 if (base::nix::DESKTOP_ENVIRONMENT_KDE3 ==
997 base::nix::GetDesktopEnvironment(env.get())) 997 base::nix::GetDesktopEnvironment(env.get()))
998 gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE); 998 gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
999 } 999 }
1000 } 1000 }
1001 1001
1002 } // namespace gtk_util 1002 } // namespace gtk_util
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/search/term_break_iterator.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698