| 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 24 matching lines...) Expand all Loading... |
| 35 #include "content/public/browser/browser_thread.h" | 35 #include "content/public/browser/browser_thread.h" |
| 36 #include "ui/base/win/shell.h" | 36 #include "ui/base/win/shell.h" |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 #if defined(USE_AURA) | 39 #if defined(USE_AURA) |
| 40 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" | 40 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" |
| 41 #include "ui/aura/window.h" | 41 #include "ui/aura/window.h" |
| 42 #include "ui/aura/window_event_dispatcher.h" | 42 #include "ui/aura/window_event_dispatcher.h" |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 #if defined(OS_WIN) || defined(OS_CHROMEOS) |
| 46 #include "ui/native_theme/native_theme_aura_dark.h" |
| 47 #include "ui/wm/core/transient_window_manager.h" |
| 48 #endif |
| 49 |
| 45 #if defined(USE_AURA) && !defined(OS_CHROMEOS) | 50 #if defined(USE_AURA) && !defined(OS_CHROMEOS) |
| 46 #include "chrome/browser/ui/host_desktop.h" | 51 #include "chrome/browser/ui/host_desktop.h" |
| 47 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 52 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 48 #include "ui/views/widget/native_widget_aura.h" | 53 #include "ui/views/widget/native_widget_aura.h" |
| 49 #endif | 54 #endif |
| 50 | 55 |
| 51 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 56 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 52 #include "ui/views/linux_ui/linux_ui.h" | 57 #include "ui/views/linux_ui/linux_ui.h" |
| 53 #endif | 58 #endif |
| 54 | 59 |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true); | 470 base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true); |
| 466 callback.Run(); | 471 callback.Run(); |
| 467 } | 472 } |
| 468 #endif | 473 #endif |
| 469 | 474 |
| 470 scoped_refptr<base::TaskRunner> | 475 scoped_refptr<base::TaskRunner> |
| 471 ChromeViewsDelegate::GetBlockingPoolTaskRunner() { | 476 ChromeViewsDelegate::GetBlockingPoolTaskRunner() { |
| 472 return content::BrowserThread::GetBlockingPool(); | 477 return content::BrowserThread::GetBlockingPool(); |
| 473 } | 478 } |
| 474 | 479 |
| 480 ui::NativeTheme* ChromeViewsDelegate::GetNonDefaultNativeTheme( |
| 481 views::Widget* widget) { |
| 482 #if defined(OS_CHROMEOS) || defined(OS_WIN) |
| 483 aura::Window* window = widget->GetNativeWindow(); |
| 484 for (aura::Window* parent = window; parent; |
| 485 parent = wm::TransientWindowManager::Get(parent)->transient_parent()) { |
| 486 window = parent; |
| 487 } |
| 488 |
| 489 views::Widget* parent_widget = |
| 490 views::Widget::GetWidgetForNativeWindow(window); |
| 491 Profile* profile = GetProfileForWindow(parent_widget); |
| 492 if (profile && profile->IsOffTheRecord()) |
| 493 return ui::NativeThemeAuraDark::instance(); |
| 494 #endif |
| 495 return nullptr; |
| 496 } |
| 497 |
| 475 #if !defined(USE_AURA) && !defined(USE_CHROMEOS) | 498 #if !defined(USE_AURA) && !defined(USE_CHROMEOS) |
| 476 views::Widget::InitParams::WindowOpacity | 499 views::Widget::InitParams::WindowOpacity |
| 477 ChromeViewsDelegate::GetOpacityForInitParams( | 500 ChromeViewsDelegate::GetOpacityForInitParams( |
| 478 const views::Widget::InitParams& params) { | 501 const views::Widget::InitParams& params) { |
| 479 return views::Widget::InitParams::OPAQUE_WINDOW; | 502 return views::Widget::InitParams::OPAQUE_WINDOW; |
| 480 } | 503 } |
| 481 #endif | 504 #endif |
| OLD | NEW |