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

Side by Side Diff: chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.cc

Issue 1550593002: Switch to standard integer types in chrome/browser/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/metro_viewer/chrome_metro_viewer_process_host_aurawin.h " 5 #include "chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h "
6 6
7 #include "ash/display/display_info.h" 7 #include "ash/display/display_info.h"
8 #include "ash/display/display_manager.h" 8 #include "ash/display/display_manager.h"
9 #include "ash/host/ash_remote_window_tree_host_win.h" 9 #include "ash/host/ash_remote_window_tree_host_win.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 return; 110 return;
111 } 111 }
112 112
113 chrome::DecrementKeepAliveCount(); 113 chrome::DecrementKeepAliveCount();
114 114
115 // This will delete the MetroViewerProcessHost object. Don't access member 115 // This will delete the MetroViewerProcessHost object. Don't access member
116 // variables/functions after this call. 116 // variables/functions after this call.
117 g_browser_process->platform_part()->OnMetroViewerProcessTerminated(); 117 g_browser_process->platform_part()->OnMetroViewerProcessTerminated();
118 } 118 }
119 119
120 void ChromeMetroViewerProcessHost::OnChannelConnected(int32 /*peer_pid*/) { 120 void ChromeMetroViewerProcessHost::OnChannelConnected(int32_t /*peer_pid*/) {
121 DVLOG(1) << "ChromeMetroViewerProcessHost::OnChannelConnected: "; 121 DVLOG(1) << "ChromeMetroViewerProcessHost::OnChannelConnected: ";
122 // Set environment variable to let breakpad know that metro process was 122 // Set environment variable to let breakpad know that metro process was
123 // connected. 123 // connected.
124 ::SetEnvironmentVariableA(env_vars::kMetroConnected, "1"); 124 ::SetEnvironmentVariableA(env_vars::kMetroConnected, "1");
125 125
126 if (!content::GpuDataManager::GetInstance()->GpuAccessAllowed(NULL)) { 126 if (!content::GpuDataManager::GetInstance()->GpuAccessAllowed(NULL)) {
127 DVLOG(1) << "No GPU access, attempting to restart in Desktop\n"; 127 DVLOG(1) << "No GPU access, attempting to restart in Desktop\n";
128 chrome::AttemptRestartToDesktopMode(); 128 chrome::AttemptRestartToDesktopMode();
129 } 129 }
130 } 130 }
(...skipping 29 matching lines...) Expand all
160 160
161 void ChromeMetroViewerProcessHost::OnHandleSearchRequest( 161 void ChromeMetroViewerProcessHost::OnHandleSearchRequest(
162 const base::string16& search_string) { 162 const base::string16& search_string) {
163 GURL url(GetDefaultSearchURLForSearchTerms( 163 GURL url(GetDefaultSearchURLForSearchTerms(
164 TemplateURLServiceFactory::GetForProfile( 164 TemplateURLServiceFactory::GetForProfile(
165 ProfileManager::GetActiveUserProfile()), search_string)); 165 ProfileManager::GetActiveUserProfile()), search_string));
166 if (url.is_valid()) 166 if (url.is_valid())
167 OpenURL(url); 167 OpenURL(url);
168 } 168 }
169 169
170 void ChromeMetroViewerProcessHost::OnWindowSizeChanged(uint32 width, 170 void ChromeMetroViewerProcessHost::OnWindowSizeChanged(uint32_t width,
171 uint32 height) { 171 uint32_t height) {
172 std::vector<ash::DisplayInfo> info_list; 172 std::vector<ash::DisplayInfo> info_list;
173 info_list.push_back(ash::DisplayInfo::CreateFromSpec( 173 info_list.push_back(ash::DisplayInfo::CreateFromSpec(
174 base::StringPrintf("%dx%d*%f", width, height, gfx::GetDPIScale()))); 174 base::StringPrintf("%dx%d*%f", width, height, gfx::GetDPIScale())));
175 ash::Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged( 175 ash::Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(
176 info_list); 176 info_list);
177 aura::RemoteWindowTreeHostWin::Instance()->HandleWindowSizeChanged(width, 177 aura::RemoteWindowTreeHostWin::Instance()->HandleWindowSizeChanged(width,
178 height); 178 height);
179 } 179 }
OLDNEW
« no previous file with comments | « chrome/browser/metro_viewer/chrome_metro_viewer_process_host_aurawin.h ('k') | chrome/browser/mouseleave_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698