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

Side by Side Diff: chrome/browser/ui/libgtkui/gtk_ui.h

Issue 2707313002: Gtk: Change NULL to nullptr (Closed)
Patch Set: Created 3 years, 10 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 | « chrome/browser/ui/libgtkui/gtk_status_icon.cc ('k') | chrome/browser/ui/libgtkui/gtk_ui.cc » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_ 5 #ifndef CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_
6 #define CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_ 6 #define CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 std::unique_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_; 171 std::unique_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_;
172 172
173 // Objects to notify when the window frame button order changes. 173 // Objects to notify when the window frame button order changes.
174 base::ObserverList<views::WindowButtonOrderObserver> observer_list_; 174 base::ObserverList<views::WindowButtonOrderObserver> observer_list_;
175 175
176 // Whether we should lower the window on a middle click to the non client 176 // Whether we should lower the window on a middle click to the non client
177 // area. 177 // area.
178 NonClientMiddleClickAction middle_click_action_; 178 NonClientMiddleClickAction middle_click_action_;
179 179
180 // Used to override the native theme for a window. If no override is provided 180 // Used to override the native theme for a window. If no override is provided
181 // or the callback returns NULL, GtkUi will default to a NativeThemeGtk2 181 // or the callback returns nullptr, GtkUi will default to a NativeThemeGtk2
182 // instance. 182 // instance.
183 NativeThemeGetter native_theme_overrider_; 183 NativeThemeGetter native_theme_overrider_;
184 184
185 float device_scale_factor_ = 1.0f; 185 float device_scale_factor_ = 1.0f;
186 186
187 DISALLOW_COPY_AND_ASSIGN(GtkUi); 187 DISALLOW_COPY_AND_ASSIGN(GtkUi);
188 }; 188 };
189 189
190 } // namespace libgtkui 190 } // namespace libgtkui
191 191
192 // Access point to the GTK2 desktop system. This should be the only symbol that 192 // Access point to the GTK2 desktop system. This should be the only symbol that
193 // is exported in the library; everything else should be used through the 193 // is exported in the library; everything else should be used through the
194 // interface, because eventually this .so will be loaded through dlopen at 194 // interface, because eventually this .so will be loaded through dlopen at
195 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or 195 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
196 // QT or whatever. 196 // QT or whatever.
197 LIBGTKUI_EXPORT views::LinuxUI* BuildGtkUi(); 197 LIBGTKUI_EXPORT views::LinuxUI* BuildGtkUi();
198 198
199 #endif // CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_ 199 #endif // CHROME_BROWSER_UI_LIBGTKUI_GTK_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtkui/gtk_status_icon.cc ('k') | chrome/browser/ui/libgtkui/gtk_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698