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

Side by Side Diff: chrome/browser/ui/views/simple_message_box_win.cc

Issue 10928184: Ensure that message boxes displayed by Chrome in Windows 8 metro mode pass in the metro core window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/ui/simple_message_box.h" 5 #include "chrome/browser/ui/simple_message_box.h"
6 6
7 #include "chrome/common/startup_metric_utils.h" 7 #include "chrome/common/startup_metric_utils.h"
8 #include "ui/base/win/hwnd_util.h"
8 #include "ui/base/win/message_box_win.h" 9 #include "ui/base/win/message_box_win.h"
9 10
10 namespace chrome { 11 namespace chrome {
11 12
12 MessageBoxResult ShowMessageBox(gfx::NativeWindow parent, 13 MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
13 const string16& title, 14 const string16& title,
14 const string16& message, 15 const string16& message,
15 MessageBoxType type) { 16 MessageBoxType type) {
16 startup_metric_utils::SetNonBrowserUIDisplayed(); 17 startup_metric_utils::SetNonBrowserUIDisplayed();
17 18
19 if (!parent)
20 parent = ui::GetWindowToParentTo(true);
21
18 UINT flags = MB_SETFOREGROUND; 22 UINT flags = MB_SETFOREGROUND;
19 flags |= ((type == MESSAGE_BOX_TYPE_QUESTION) ? MB_YESNO : MB_OK); 23 flags |= ((type == MESSAGE_BOX_TYPE_QUESTION) ? MB_YESNO : MB_OK);
20 flags |= ((type == MESSAGE_BOX_TYPE_INFORMATION) ? 24 flags |= ((type == MESSAGE_BOX_TYPE_INFORMATION) ?
21 MB_ICONINFORMATION : MB_ICONWARNING); 25 MB_ICONINFORMATION : MB_ICONWARNING);
22 return (ui::MessageBox(parent, message, title, flags) == IDNO) ? 26 return (ui::MessageBox(parent, message, title, flags) == IDNO) ?
23 MESSAGE_BOX_RESULT_NO : MESSAGE_BOX_RESULT_YES; 27 MESSAGE_BOX_RESULT_NO : MESSAGE_BOX_RESULT_YES;
24 } 28 }
25 29
26 } // namespace chrome 30 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698