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

Side by Side Diff: ui/views/views_delegate.h

Issue 780913002: Revert of Fix icon on Windows XP taskbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « ui/views/test/test_views_delegate.h ('k') | ui/views/win/hwnd_message_handler.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 #ifndef UI_VIEWS_VIEWS_DELEGATE_H_ 5 #ifndef UI_VIEWS_VIEWS_DELEGATE_H_
6 #define UI_VIEWS_VIEWS_DELEGATE_H_ 6 #define UI_VIEWS_VIEWS_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // so that alternate feedback (speech / magnified text) can be provided. 88 // so that alternate feedback (speech / magnified text) can be provided.
89 virtual void NotifyMenuItemFocused(const base::string16& menu_name, 89 virtual void NotifyMenuItemFocused(const base::string16& menu_name,
90 const base::string16& menu_item_name, 90 const base::string16& menu_item_name,
91 int item_index, 91 int item_index,
92 int item_count, 92 int item_count,
93 bool has_submenu); 93 bool has_submenu);
94 94
95 #if defined(OS_WIN) 95 #if defined(OS_WIN)
96 // Retrieves the default window icon to use for windows if none is specified. 96 // Retrieves the default window icon to use for windows if none is specified.
97 virtual HICON GetDefaultWindowIcon() const; 97 virtual HICON GetDefaultWindowIcon() const;
98 // Retrieves the small window icon to use for windows if none is specified.
99 virtual HICON GetSmallWindowIcon() const = 0;
100 // Returns true if the window passed in is in the Windows 8 metro 98 // Returns true if the window passed in is in the Windows 8 metro
101 // environment. 99 // environment.
102 virtual bool IsWindowInMetro(gfx::NativeWindow window) const; 100 virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
103 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) 101 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
104 virtual gfx::ImageSkia* GetDefaultWindowIcon() const; 102 virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
105 #endif 103 #endif
106 104
107 // Creates a default NonClientFrameView to be used for windows that don't 105 // Creates a default NonClientFrameView to be used for windows that don't
108 // specify their own. If this function returns NULL, the 106 // specify their own. If this function returns NULL, the
109 // views::CustomFrameView type will be used. 107 // views::CustomFrameView type will be used.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 149
152 private: 150 private:
153 scoped_ptr<ViewsTouchSelectionControllerFactory> views_tsc_factory_; 151 scoped_ptr<ViewsTouchSelectionControllerFactory> views_tsc_factory_;
154 152
155 DISALLOW_COPY_AND_ASSIGN(ViewsDelegate); 153 DISALLOW_COPY_AND_ASSIGN(ViewsDelegate);
156 }; 154 };
157 155
158 } // namespace views 156 } // namespace views
159 157
160 #endif // UI_VIEWS_VIEWS_DELEGATE_H_ 158 #endif // UI_VIEWS_VIEWS_DELEGATE_H_
OLDNEW
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/win/hwnd_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698