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

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

Issue 23291003: Don't try to use compositor to display dialog before compositor is initialized (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: refactor to avoid copying Created 7 years, 4 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 | « chrome/browser/ui/views/simple_message_box_win.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | 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/hwnd_util.h"
9 #include "ui/base/win/message_box_win.h" 9 #include "ui/base/win/message_box_win.h"
10 10
11 namespace chrome { 11 namespace chrome {
12 12
13 MessageBoxResult ShowMessageBox(gfx::NativeWindow parent, 13 MessageBoxResult NativeShowMessageBox(HWND parent,
14 const string16& title, 14 const string16& title,
15 const string16& message, 15 const string16& message,
16 MessageBoxType type) { 16 MessageBoxType type) {
17 startup_metric_utils::SetNonBrowserUIDisplayed();
18
19 if (!parent)
20 parent = ui::GetWindowToParentTo(true);
21
22 UINT flags = MB_SETFOREGROUND; 17 UINT flags = MB_SETFOREGROUND;
23 if (type == MESSAGE_BOX_TYPE_QUESTION) { 18 if (type == MESSAGE_BOX_TYPE_QUESTION) {
24 flags |= MB_YESNO; 19 flags |= MB_YESNO;
25 } else if (type == MESSAGE_BOX_TYPE_OK_CANCEL) { 20 } else if (type == MESSAGE_BOX_TYPE_OK_CANCEL) {
26 flags |= MB_OKCANCEL; 21 flags |= MB_OKCANCEL;
27 } else { 22 } else {
28 flags |= MB_OK; 23 flags |= MB_OK;
29 } 24 }
30 flags |= ((type == MESSAGE_BOX_TYPE_INFORMATION) ? 25 flags |= ((type == MESSAGE_BOX_TYPE_INFORMATION) ?
31 MB_ICONINFORMATION : MB_ICONWARNING); 26 MB_ICONINFORMATION : MB_ICONWARNING);
32 int result = ui::MessageBox(parent, message, title, flags); 27 int result = ui::MessageBox(parent, message, title, flags);
33 return (result == IDYES || result == IDOK) ? 28 return (result == IDYES || result == IDOK) ?
34 MESSAGE_BOX_RESULT_YES : MESSAGE_BOX_RESULT_NO; 29 MESSAGE_BOX_RESULT_YES : MESSAGE_BOX_RESULT_NO;
35 } 30 }
36 31
32 #if !defined(USE_AURA)
33 MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
34 const string16& title,
35 const string16& message,
36 MessageBoxType type) {
37 startup_metric_utils::SetNonBrowserUIDisplayed();
38
39 if (!parent)
40 parent = ui::GetWindowToParentTo(true);
41
42 return NativeShowMessageBox(parent, title, message, type);
43 }
44 #endif
45
37 } // namespace chrome 46 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/simple_message_box_win.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698