OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/event_disposition.h" |
11 #include "chrome/browser/prefs/pref_service.h" | 12 #include "chrome/browser/prefs/pref_service.h" |
12 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 13 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
13 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
14 #include "chrome/browser/ui/views/accessibility_event_router_views.h" | 15 #include "chrome/browser/ui/views/accessibility_event_router_views.h" |
15 #include "chrome/browser/ui/views/event_utils.h" | |
16 #include "chrome/browser/ui/window_sizer.h" | 16 #include "chrome/browser/ui/window_sizer.h" |
17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
18 #include "ui/base/clipboard/clipboard.h" | 18 #include "ui/base/clipboard/clipboard.h" |
19 #include "ui/gfx/rect.h" | 19 #include "ui/gfx/rect.h" |
20 #include "views/widget/native_widget.h" | 20 #include "views/widget/native_widget.h" |
21 #include "views/widget/widget.h" | 21 #include "views/widget/widget.h" |
22 | 22 |
23 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
24 #include "chrome/browser/app_icon_win.h" | 24 #include "chrome/browser/app_icon_win.h" |
25 #endif | 25 #endif |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 | 139 |
140 void ChromeViewsDelegate::AddRef() { | 140 void ChromeViewsDelegate::AddRef() { |
141 g_browser_process->AddRefModule(); | 141 g_browser_process->AddRefModule(); |
142 } | 142 } |
143 | 143 |
144 void ChromeViewsDelegate::ReleaseRef() { | 144 void ChromeViewsDelegate::ReleaseRef() { |
145 g_browser_process->ReleaseModule(); | 145 g_browser_process->ReleaseModule(); |
146 } | 146 } |
147 | 147 |
148 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) { | 148 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) { |
149 return event_utils::DispositionFromEventFlags(event_flags); | 149 return browser::DispositionFromEventFlags(event_flags); |
150 } | 150 } |
OLD | NEW |