OLD | NEW |
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/views/chrome_views_delegate.h" | 5 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/prefs/scoped_user_pref_update.h" | 9 #include "base/prefs/scoped_user_pref_update.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 bool has_submenu) { | 223 bool has_submenu) { |
224 AccessibilityEventRouterViews::GetInstance()->HandleMenuItemFocused( | 224 AccessibilityEventRouterViews::GetInstance()->HandleMenuItemFocused( |
225 menu_name, menu_item_name, item_index, item_count, has_submenu); | 225 menu_name, menu_item_name, item_index, item_count, has_submenu); |
226 } | 226 } |
227 | 227 |
228 #if defined(OS_WIN) | 228 #if defined(OS_WIN) |
229 HICON ChromeViewsDelegate::GetDefaultWindowIcon() const { | 229 HICON ChromeViewsDelegate::GetDefaultWindowIcon() const { |
230 return GetAppIcon(); | 230 return GetAppIcon(); |
231 } | 231 } |
232 | 232 |
| 233 HICON ChromeViewsDelegate::GetSmallWindowIcon() const { |
| 234 return GetSmallAppIcon(); |
| 235 } |
| 236 |
233 bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { | 237 bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { |
234 return chrome::IsNativeViewInAsh(window); | 238 return chrome::IsNativeViewInAsh(window); |
235 } | 239 } |
236 | 240 |
237 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) | 241 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) |
238 gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { | 242 gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { |
239 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 243 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
240 return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); | 244 return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); |
241 } | 245 } |
242 #endif | 246 #endif |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 } | 430 } |
427 #endif | 431 #endif |
428 | 432 |
429 #if !defined(USE_AURA) && !defined(USE_CHROMEOS) | 433 #if !defined(USE_AURA) && !defined(USE_CHROMEOS) |
430 views::Widget::InitParams::WindowOpacity | 434 views::Widget::InitParams::WindowOpacity |
431 ChromeViewsDelegate::GetOpacityForInitParams( | 435 ChromeViewsDelegate::GetOpacityForInitParams( |
432 const views::Widget::InitParams& params) { | 436 const views::Widget::InitParams& params) { |
433 return views::Widget::InitParams::OPAQUE_WINDOW; | 437 return views::Widget::InitParams::OPAQUE_WINDOW; |
434 } | 438 } |
435 #endif | 439 #endif |
OLD | NEW |