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

Side by Side Diff: ash/test/test_metro_viewer_process_host.cc

Issue 22876030: Remove using the Shell desktop Window when we don't have an acceleated widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ash/test/test_metro_viewer_process_host.h" 5 #include "ash/test/test_metro_viewer_process_host.h"
6 6
7 #include <windef.h> 7 #include <windef.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/aura/remote_root_window_host_win.h" 10 #include "ui/aura/remote_root_window_host_win.h"
(...skipping 12 matching lines...) Expand all
23 23
24 void TestMetroViewerProcessHost::OnChannelError() { 24 void TestMetroViewerProcessHost::OnChannelError() {
25 closed_unexpectedly_ = true; 25 closed_unexpectedly_ = true;
26 aura::RemoteRootWindowHostWin::Instance()->Disconnected(); 26 aura::RemoteRootWindowHostWin::Instance()->Disconnected();
27 } 27 }
28 28
29 void TestMetroViewerProcessHost::OnSetTargetSurface( 29 void TestMetroViewerProcessHost::OnSetTargetSurface(
30 gfx::NativeViewId target_surface) { 30 gfx::NativeViewId target_surface) {
31 DLOG(INFO) << __FUNCTION__ << ", target_surface = " << target_surface; 31 DLOG(INFO) << __FUNCTION__ << ", target_surface = " << target_surface;
32 HWND hwnd = reinterpret_cast<HWND>(target_surface); 32 HWND hwnd = reinterpret_cast<HWND>(target_surface);
33 aura::RemoteRootWindowHostWin::Instance()->Connected(this, hwnd);
33 34
34 backing_surface_.reset(new AcceleratedSurface(hwnd)); 35 backing_surface_.reset(new AcceleratedSurface(hwnd));
cpu_(ooo_6.6-7.5) 2013/08/25 23:35:17 note that here I switched the order (see lines 34
35
36 scoped_refptr<AcceleratedPresenter> any_window =
37 AcceleratedPresenter::GetForWindow(NULL);
38 any_window->SetNewTargetWindow(hwnd);
39 aura::RemoteRootWindowHostWin::Instance()->Connected(this);
40 } 36 }
41 37
42 void TestMetroViewerProcessHost::OnOpenURL(const string16& url) { 38 void TestMetroViewerProcessHost::OnOpenURL(const string16& url) {
43 } 39 }
44 40
45 void TestMetroViewerProcessHost::OnHandleSearchRequest( 41 void TestMetroViewerProcessHost::OnHandleSearchRequest(
46 const string16& search_string) { 42 const string16& search_string) {
47 } 43 }
48 44
49 } // namespace test 45 } // namespace test
50 } // namespace ash 46 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698