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

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

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 11 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
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_border.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_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_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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 virtual bool GetUseSystemTheme() const OVERRIDE; 90 virtual bool GetUseSystemTheme() const OVERRIDE;
91 virtual bool GetDefaultUsesSystemTheme() const OVERRIDE; 91 virtual bool GetDefaultUsesSystemTheme() const OVERRIDE;
92 virtual void SetDownloadCount(int count) const OVERRIDE; 92 virtual void SetDownloadCount(int count) const OVERRIDE;
93 virtual void SetProgressFraction(float percentage) const OVERRIDE; 93 virtual void SetProgressFraction(float percentage) const OVERRIDE;
94 virtual bool IsStatusIconSupported() const OVERRIDE; 94 virtual bool IsStatusIconSupported() const OVERRIDE;
95 virtual scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon( 95 virtual scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
96 const gfx::ImageSkia& image, 96 const gfx::ImageSkia& image,
97 const base::string16& tool_tip) const OVERRIDE; 97 const base::string16& tool_tip) const OVERRIDE;
98 virtual gfx::Image GetIconForContentType( 98 virtual gfx::Image GetIconForContentType(
99 const std::string& content_type, int size) const OVERRIDE; 99 const std::string& content_type, int size) const OVERRIDE;
100 virtual views::Border* CreateNativeBorder( 100 virtual scoped_ptr<views::Border> CreateNativeBorder(
101 views::CustomButton* owning_button, 101 views::CustomButton* owning_button,
102 views::Border* border) OVERRIDE; 102 scoped_ptr<views::Border> border) OVERRIDE;
103 virtual void AddWindowButtonOrderObserver( 103 virtual void AddWindowButtonOrderObserver(
104 views::WindowButtonOrderObserver* observer) OVERRIDE; 104 views::WindowButtonOrderObserver* observer) OVERRIDE;
105 virtual void RemoveWindowButtonOrderObserver( 105 virtual void RemoveWindowButtonOrderObserver(
106 views::WindowButtonOrderObserver* observer) OVERRIDE; 106 views::WindowButtonOrderObserver* observer) OVERRIDE;
107 virtual bool UnityIsRunning() OVERRIDE; 107 virtual bool UnityIsRunning() OVERRIDE;
108 108
109 private: 109 private:
110 typedef std::map<int, SkColor> ColorMap; 110 typedef std::map<int, SkColor> ColorMap;
111 typedef std::map<int, color_utils::HSL> TintMap; 111 typedef std::map<int, color_utils::HSL> TintMap;
112 typedef std::map<int, gfx::Image> ImageCache; 112 typedef std::map<int, gfx::Image> ImageCache;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 } // namespace libgtk2ui 243 } // namespace libgtk2ui
244 244
245 // Access point to the GTK2 desktop system. This should be the only symbol that 245 // Access point to the GTK2 desktop system. This should be the only symbol that
246 // is exported in the library; everything else should be used through the 246 // is exported in the library; everything else should be used through the
247 // interface, because eventually this .so will be loaded through dlopen at 247 // interface, because eventually this .so will be loaded through dlopen at
248 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or 248 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
249 // QT or whatever. 249 // QT or whatever.
250 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI(); 250 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
251 251
252 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_ 252 #endif // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_border.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698