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

Side by Side Diff: chrome/browser/chrome_process_finder_win.cc

Issue 18348025: ProcessSingleton now uses base::win::MessageWindow to create a message-only window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_test::ContextMenuTest destroys the clipboard Created 7 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/chrome_process_finder_win.h" 5 #include "chrome/browser/chrome_process_finder_win.h"
6 6
7 #include <shellapi.h> 7 #include <shellapi.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/process_info.h" 14 #include "base/process_info.h"
15 #include "base/process_util.h" 15 #include "base/process_util.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "base/win/message_window.h"
19 #include "base/win/metro.h" 20 #include "base/win/metro.h"
20 #include "base/win/scoped_handle.h" 21 #include "base/win/scoped_handle.h"
21 #include "base/win/win_util.h" 22 #include "base/win/win_util.h"
22 #include "base/win/windows_version.h" 23 #include "base/win/windows_version.h"
23 #include "chrome/browser/metro_utils/metro_chrome_win.h" 24 #include "chrome/browser/metro_utils/metro_chrome_win.h"
24 #include "chrome/common/chrome_constants.h" 25 #include "chrome/common/chrome_constants.h"
25 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
26 27
27 28
28 namespace { 29 namespace {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 return Escape(text, kQueryCharmap, use_plus); 92 return Escape(text, kQueryCharmap, use_plus);
92 } 93 }
93 94
94 // END COPY from net/base/escape.cc 95 // END COPY from net/base/escape.cc
95 96
96 } // namespace 97 } // namespace
97 98
98 namespace chrome { 99 namespace chrome {
99 100
100 HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) { 101 HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) {
101 return FindWindowEx(HWND_MESSAGE, NULL, chrome::kMessageWindowClass, 102 return base::win::MessageWindow::FindWindow(user_data_dir.value());
102 user_data_dir.value().c_str());
103 } 103 }
104 104
105 NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window, 105 NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window,
106 bool fast_start) { 106 bool fast_start) {
107 DCHECK(remote_window); 107 DCHECK(remote_window);
108 static const char kSearchUrl[] = 108 static const char kSearchUrl[] =
109 "http://www.google.com/search?q=%s&sourceid=chrome&ie=UTF-8"; 109 "http://www.google.com/search?q=%s&sourceid=chrome&ie=UTF-8";
110 DWORD process_id = 0; 110 DWORD process_id = 0;
111 DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id); 111 DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);
112 if (!thread_id || !process_id) 112 if (!thread_id || !process_id)
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 // It is possible that the process owning this window may have died by now. 187 // It is possible that the process owning this window may have died by now.
188 if (!::IsWindow(remote_window)) 188 if (!::IsWindow(remote_window))
189 return NOTIFY_FAILED; 189 return NOTIFY_FAILED;
190 190
191 // If the window couldn't be notified but still exists, assume it is hung. 191 // If the window couldn't be notified but still exists, assume it is hung.
192 return NOTIFY_WINDOW_HUNG; 192 return NOTIFY_WINDOW_HUNG;
193 } 193 }
194 194
195 } // namespace chrome 195 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698