| 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 | |
| 237 bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { | 233 bool ChromeViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { |
| 238 return chrome::IsNativeViewInAsh(window); | 234 return chrome::IsNativeViewInAsh(window); |
| 239 } | 235 } |
| 240 | 236 |
| 241 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) | 237 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 242 gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { | 238 gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { |
| 243 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 239 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
| 244 return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); | 240 return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); |
| 245 } | 241 } |
| 246 #endif | 242 #endif |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 } | 426 } |
| 431 #endif | 427 #endif |
| 432 | 428 |
| 433 #if !defined(USE_AURA) && !defined(USE_CHROMEOS) | 429 #if !defined(USE_AURA) && !defined(USE_CHROMEOS) |
| 434 views::Widget::InitParams::WindowOpacity | 430 views::Widget::InitParams::WindowOpacity |
| 435 ChromeViewsDelegate::GetOpacityForInitParams( | 431 ChromeViewsDelegate::GetOpacityForInitParams( |
| 436 const views::Widget::InitParams& params) { | 432 const views::Widget::InitParams& params) { |
| 437 return views::Widget::InitParams::OPAQUE_WINDOW; | 433 return views::Widget::InitParams::OPAQUE_WINDOW; |
| 438 } | 434 } |
| 439 #endif | 435 #endif |
| OLD | NEW |