OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
8 #include "base/process_util.h" | 8 #include "base/process_util.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 views::desktop::DesktopWindowView::CreateDesktopWindow( | 75 views::desktop::DesktopWindowView::CreateDesktopWindow( |
76 views::desktop::DesktopWindowView::DESKTOP_DEFAULT); | 76 views::desktop::DesktopWindowView::DESKTOP_DEFAULT); |
77 views::desktop::DesktopWindowView::desktop_window_view->CreateTestWindow( | 77 views::desktop::DesktopWindowView::desktop_window_view->CreateTestWindow( |
78 ASCIIToUTF16("Sample Window 1"), SK_ColorWHITE, | 78 ASCIIToUTF16("Sample Window 1"), SK_ColorWHITE, |
79 gfx::Rect(500, 200, 400, 400), true); | 79 gfx::Rect(500, 200, 400, 400), true); |
80 views::desktop::DesktopWindowView::desktop_window_view->CreateTestWindow( | 80 views::desktop::DesktopWindowView::desktop_window_view->CreateTestWindow( |
81 ASCIIToUTF16("Sample Window 2"), SK_ColorRED, | 81 ASCIIToUTF16("Sample Window 2"), SK_ColorRED, |
82 gfx::Rect(600, 450, 450, 300), false); | 82 gfx::Rect(600, 450, 450, 300), false); |
83 | 83 |
84 views::AcceleratorHandler accelerator_handler; | 84 views::AcceleratorHandler accelerator_handler; |
85 MessageLoopForUI::current()->Run(&accelerator_handler); | 85 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); |
86 | 86 |
87 #if defined(OS_WIN) | 87 #if defined(OS_WIN) |
88 OleUninitialize(); | 88 OleUninitialize(); |
89 #endif | 89 #endif |
90 return 0; | 90 return 0; |
91 } | 91 } |
OLD | NEW |