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

Side by Side Diff: chrome/browser/ui/libgtkui/gtk2_util.cc

Issue 2449243002: Gtk3 ui: Add libgtk3ui as a separate build component (Closed)
Patch Set: Add theme_properties dep to //chrome/browser/ui Created 4 years, 1 month 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 | « chrome/browser/ui/libgtkui/gtk2_util.h ('k') | chrome/browser/ui/libgtkui/libgtkui_export.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 (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/libgtk2ui/gtk2_util.h" 5 #include "chrome/browser/ui/libgtkui/gtk2_util.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <gdk/gdkx.h> 8 #include <gdk/gdkx.h>
9 #include <gtk/gtk.h> 9 #include <gtk/gtk.h>
10 #include <stddef.h> 10 #include <stddef.h>
11 11
12 #include <memory> 12 #include <memory>
13 13
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/debug/leak_annotations.h" 15 #include "base/debug/leak_annotations.h"
(...skipping 27 matching lines...) Expand all
43 ANNOTATE_SCOPED_MEMORY_LEAK; 43 ANNOTATE_SCOPED_MEMORY_LEAK;
44 init_func(&argc, &argv_pointer); 44 init_func(&argc, &argv_pointer);
45 } 45 }
46 for (size_t i = 0; i < args.size(); ++i) { 46 for (size_t i = 0; i < args.size(); ++i) {
47 free(argv[i]); 47 free(argv[i]);
48 } 48 }
49 } 49 }
50 50
51 } // namespace 51 } // namespace
52 52
53 namespace libgtk2ui { 53 namespace libgtkui {
54 54
55 void GtkInitFromCommandLine(const base::CommandLine& command_line) { 55 void GtkInitFromCommandLine(const base::CommandLine& command_line) {
56 CommonInitFromCommandLine(command_line, gtk_init); 56 CommonInitFromCommandLine(command_line, gtk_init);
57 } 57 }
58 58
59 // TODO(erg): This method was copied out of shell_integration_linux.cc. Because 59 // TODO(erg): This method was copied out of shell_integration_linux.cc. Because
60 // of how this library is structured as a stand alone .so, we can't call code 60 // of how this library is structured as a stand alone .so, we can't call code
61 // from browser and above. 61 // from browser and above.
62 std::string GetDesktopName(base::Environment* env) { 62 std::string GetDesktopName(base::Environment* env) {
63 #if defined(GOOGLE_CHROME_BUILD) 63 #if defined(GOOGLE_CHROME_BUILD)
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 aura::Window* GetAuraTransientParent(GtkWidget* dialog) { 135 aura::Window* GetAuraTransientParent(GtkWidget* dialog) {
136 return reinterpret_cast<aura::Window*>( 136 return reinterpret_cast<aura::Window*>(
137 g_object_get_data(G_OBJECT(dialog), kAuraTransientParent)); 137 g_object_get_data(G_OBJECT(dialog), kAuraTransientParent));
138 } 138 }
139 139
140 void ClearAuraTransientParent(GtkWidget* dialog) { 140 void ClearAuraTransientParent(GtkWidget* dialog) {
141 g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL); 141 g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL);
142 } 142 }
143 143
144 } // namespace libgtk2ui 144 } // namespace libgtkui
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtkui/gtk2_util.h ('k') | chrome/browser/ui/libgtkui/libgtkui_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698