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

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.h

Issue 244893004: Improve some naming (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge and ShouldInitWithSystemTheme Created 6 years, 8 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) 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_LIBGTK2UI_GTK2_UI_H_ 5 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 6 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 const base::string16& tool_tip) const OVERRIDE; 100 const base::string16& tool_tip) const OVERRIDE;
101 virtual gfx::Image GetIconForContentType( 101 virtual gfx::Image GetIconForContentType(
102 const std::string& content_type, int size) const OVERRIDE; 102 const std::string& content_type, int size) const OVERRIDE;
103 virtual scoped_ptr<views::Border> CreateNativeBorder( 103 virtual scoped_ptr<views::Border> CreateNativeBorder(
104 views::LabelButton* owning_button, 104 views::LabelButton* owning_button,
105 scoped_ptr<views::Border> border) OVERRIDE; 105 scoped_ptr<views::Border> border) OVERRIDE;
106 virtual void AddWindowButtonOrderObserver( 106 virtual void AddWindowButtonOrderObserver(
107 views::WindowButtonOrderObserver* observer) OVERRIDE; 107 views::WindowButtonOrderObserver* observer) OVERRIDE;
108 virtual void RemoveWindowButtonOrderObserver( 108 virtual void RemoveWindowButtonOrderObserver(
109 views::WindowButtonOrderObserver* observer) OVERRIDE; 109 views::WindowButtonOrderObserver* observer) OVERRIDE;
110 virtual void AddNativeThemeChangeObserver( 110 virtual void AddSystemThemeChangeObserver(
111 views::NativeThemeChangeObserver* observer) OVERRIDE; 111 views::SystemThemeChangeObserver* observer) OVERRIDE;
112 virtual void RemoveNativeThemeChangeObserver( 112 virtual void RemoveSystemThemeChangeObserver(
113 views::NativeThemeChangeObserver* observer) OVERRIDE; 113 views::SystemThemeChangeObserver* observer) OVERRIDE;
114 virtual bool UnityIsRunning() OVERRIDE; 114 virtual bool UnityIsRunning() OVERRIDE;
115 virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() OVERRIDE; 115 virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() OVERRIDE;
116 virtual void NotifyWindowManagerStartupComplete() OVERRIDE; 116 virtual void NotifyWindowManagerStartupComplete() OVERRIDE;
117 117
118 // ui::TextEditKeybindingDelegate: 118 // ui::TextEditKeybindingDelegate:
119 virtual bool MatchEvent( 119 virtual bool MatchEvent(
120 const ui::Event& event, 120 const ui::Event& event,
121 std::vector<ui::TextEditCommandAuraLinux>* commands) OVERRIDE; 121 std::vector<ui::TextEditCommandAuraLinux>* commands) OVERRIDE;
122 122
123 private: 123 private:
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 // window button configuration. 240 // window button configuration.
241 std::vector<views::FrameButton> leading_buttons_; 241 std::vector<views::FrameButton> leading_buttons_;
242 std::vector<views::FrameButton> trailing_buttons_; 242 std::vector<views::FrameButton> trailing_buttons_;
243 243
244 scoped_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_; 244 scoped_ptr<Gtk2KeyBindingsHandler> key_bindings_handler_;
245 245
246 // Objects to notify when the window frame button order changes. 246 // Objects to notify when the window frame button order changes.
247 ObserverList<views::WindowButtonOrderObserver> observer_list_; 247 ObserverList<views::WindowButtonOrderObserver> observer_list_;
248 248
249 // Observers to notify when the theme state changes. 249 // Observers to notify when the theme state changes.
250 ObserverList<views::NativeThemeChangeObserver> theme_change_observers_; 250 ObserverList<views::SystemThemeChangeObserver> theme_change_observers_;
251 251
252 // Whether we should lower the window on a middle click to the non client 252 // Whether we should lower the window on a middle click to the non client
253 // area. 253 // area.
254 NonClientMiddleClickAction middle_click_action_; 254 NonClientMiddleClickAction middle_click_action_;
255 255
256 // Image cache of lazily created images. 256 // Image cache of lazily created images.
257 mutable ImageCache gtk_images_; 257 mutable ImageCache gtk_images_;
258 258
259 DISALLOW_COPY_AND_ASSIGN(Gtk2UI); 259 DISALLOW_COPY_AND_ASSIGN(Gtk2UI);
260 }; 260 };
261 261
262 } // namespace libgtk2ui 262 } // namespace libgtk2ui
263 263
264 // Access point to the GTK2 desktop system. This should be the only symbol that 264 // Access point to the GTK2 desktop system. This should be the only symbol that
265 // is exported in the library; everything else should be used through the 265 // is exported in the library; everything else should be used through the
266 // interface, because eventually this .so will be loaded through dlopen at 266 // interface, because eventually this .so will be loaded through dlopen at
267 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or 267 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
268 // QT or whatever. 268 // QT or whatever.
269 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI(); 269 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
270 270
271 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 271 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698