Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2705333006: Move client_native_pixmap_factory.h from ui/ozone/public to ui/gfx (Closed)
Patch Set: Just rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 #if defined(OS_MACOSX) 137 #if defined(OS_MACOSX)
138 #include "base/memory/memory_pressure_monitor_mac.h" 138 #include "base/memory/memory_pressure_monitor_mac.h"
139 #include "content/browser/bootstrap_sandbox_manager_mac.h" 139 #include "content/browser/bootstrap_sandbox_manager_mac.h"
140 #include "content/browser/cocoa/system_hotkey_helper_mac.h" 140 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
141 #include "content/browser/mach_broker_mac.h" 141 #include "content/browser/mach_broker_mac.h"
142 #include "content/browser/renderer_host/browser_compositor_view_mac.h" 142 #include "content/browser/renderer_host/browser_compositor_view_mac.h"
143 #include "content/browser/theme_helper_mac.h" 143 #include "content/browser/theme_helper_mac.h"
144 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" 144 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
145 #endif 145 #endif
146 146
147 #if defined(USE_OZONE) 147 #if defined(OS_LINUX)
148 #include "ui/ozone/public/client_native_pixmap_factory.h" 148 #include "ui/gfx/client_native_pixmap_factory.h"
149 #endif 149 #endif
150 150
151 #if defined(OS_WIN) 151 #if defined(OS_WIN)
152 #include <windows.h> 152 #include <windows.h>
153 #include <commctrl.h> 153 #include <commctrl.h>
154 #include <shellapi.h> 154 #include <shellapi.h>
155 155
156 #include "base/memory/memory_pressure_monitor_win.h" 156 #include "base/memory/memory_pressure_monitor_win.h"
157 #include "base/win/windows_version.h" 157 #include "base/win/windows_version.h"
158 #include "content/browser/screen_orientation/screen_orientation_delegate_win.h" 158 #include "content/browser/screen_orientation/screen_orientation_delegate_win.h"
(...skipping 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1788 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 1788 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
1789 MediaInternals::GetInstance()); 1789 MediaInternals::GetInstance());
1790 } 1790 }
1791 CHECK(audio_manager_); 1791 CHECK(audio_manager_);
1792 1792
1793 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); 1793 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
1794 CHECK(audio_system_); 1794 CHECK(audio_system_);
1795 } 1795 }
1796 1796
1797 } // namespace content 1797 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/renderer_main.cc » ('j') | ui/gfx/client_native_pixmap_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698