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 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
465 base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true); | 465 base::AutoReset<bool> in_callback_setter(&in_autohide_edges_callback_, true); |
466 callback.Run(); | 466 callback.Run(); |
467 } | 467 } |
468 #endif | 468 #endif |
469 | 469 |
470 scoped_refptr<base::TaskRunner> | 470 scoped_refptr<base::TaskRunner> |
471 ChromeViewsDelegate::GetBlockingPoolTaskRunner() { | 471 ChromeViewsDelegate::GetBlockingPoolTaskRunner() { |
472 return content::BrowserThread::GetBlockingPool(); | 472 return content::BrowserThread::GetBlockingPool(); |
473 } | 473 } |
474 | 474 |
475 #if !defined(USE_AURA) && !defined(USE_CHROMEOS) | 475 #if !defined(USE_ASH) |
476 views::Widget::InitParams::WindowOpacity | 476 views::Widget::InitParams::WindowOpacity |
477 ChromeViewsDelegate::GetOpacityForInitParams( | 477 ChromeViewsDelegate::GetOpacityForInitParams( |
478 const views::Widget::InitParams& params) { | 478 const views::Widget::InitParams& params) { |
479 return views::Widget::InitParams::OPAQUE_WINDOW; | 479 return views::Widget::InitParams::OPAQUE_WINDOW; |
480 } | 480 } |
481 #endif | 481 #endif |
OLD | NEW |