Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 #endif // defined(OS_WIN) | 148 #endif // defined(OS_WIN) |
| 149 | 149 |
| 150 #if defined(OS_MACOSX) | 150 #if defined(OS_MACOSX) |
| 151 #include <Security/Security.h> | 151 #include <Security/Security.h> |
| 152 #include "chrome/browser/ui/cocoa/install_from_dmg.h" | 152 #include "chrome/browser/ui/cocoa/install_from_dmg.h" |
| 153 #endif | 153 #endif |
| 154 | 154 |
| 155 #if defined(TOOLKIT_VIEWS) | 155 #if defined(TOOLKIT_VIEWS) |
| 156 #include "chrome/browser/views/chrome_views_delegate.h" | 156 #include "chrome/browser/views/chrome_views_delegate.h" |
| 157 #include "views/focus/accelerator_handler.h" | 157 #include "views/focus/accelerator_handler.h" |
| 158 #if defined(OS_LINUX) | |
|
rjkroege
2010/12/15 21:23:31
Why OS_LINUX? We have been TOUCH_UI for the touch
oshima
2010/12/16 01:15:19
This currently does not compile on Windows due to
| |
| 159 #include "views/controls/textfield/native_textfield_view.h" | |
| 160 #endif | |
| 158 #endif | 161 #endif |
| 159 | 162 |
| 160 #if defined(OS_CHROMEOS) | 163 #if defined(OS_CHROMEOS) |
| 161 #include "chrome/browser/chromeos/cros/cros_library.h" | 164 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 162 #include "chrome/browser/chromeos/cros/screen_lock_library.h" | 165 #include "chrome/browser/chromeos/cros/screen_lock_library.h" |
| 163 #include "chrome/browser/chromeos/customization_document.h" | 166 #include "chrome/browser/chromeos/customization_document.h" |
| 164 #include "chrome/browser/chromeos/external_metrics.h" | 167 #include "chrome/browser/chromeos/external_metrics.h" |
| 165 #include "chrome/browser/chromeos/login/authenticator.h" | 168 #include "chrome/browser/chromeos/login/authenticator.h" |
| 166 #include "chrome/browser/chromeos/login/login_utils.h" | 169 #include "chrome/browser/chromeos/login/login_utils.h" |
| 167 #include "chrome/browser/chromeos/login/screen_locker.h" | 170 #include "chrome/browser/chromeos/login/screen_locker.h" |
| (...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 886 // It is important for this to happen before the first run dialog, as it | 889 // It is important for this to happen before the first run dialog, as it |
| 887 // styles the dialog as well. | 890 // styles the dialog as well. |
| 888 gtk_util::InitRCStyles(); | 891 gtk_util::InitRCStyles(); |
| 889 #endif | 892 #endif |
| 890 | 893 |
| 891 #if defined(TOOLKIT_VIEWS) | 894 #if defined(TOOLKIT_VIEWS) |
| 892 // The delegate needs to be set before any UI is created so that windows | 895 // The delegate needs to be set before any UI is created so that windows |
| 893 // display the correct icon. | 896 // display the correct icon. |
| 894 if (!views::ViewsDelegate::views_delegate) | 897 if (!views::ViewsDelegate::views_delegate) |
| 895 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; | 898 views::ViewsDelegate::views_delegate = new ChromeViewsDelegate; |
| 899 | |
| 900 #if defined(OS_LINUX) | |
| 901 if (parameters.command_line_.HasSwitch(switches::kEnableTextfieldView)) | |
|
beng (no_code_reviews)
2010/12/15 20:42:00
This check should be done inside CreateWrapper, ra
oshima
2010/12/16 01:15:19
I originally had it in CreateWrapper, but I moved
| |
| 902 views::NativeTextfieldView::SetEnableTextfieldView(true); | |
| 903 #endif | |
| 904 | |
| 896 #endif | 905 #endif |
| 897 | 906 |
| 898 #if defined(OS_WIN) | 907 #if defined(OS_WIN) |
| 899 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont; | 908 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont; |
| 900 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize; | 909 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize; |
| 901 | 910 |
| 902 // Init common control sex. | 911 // Init common control sex. |
| 903 INITCOMMONCONTROLSEX config; | 912 INITCOMMONCONTROLSEX config; |
| 904 config.dwSize = sizeof(config); | 913 config.dwSize = sizeof(config); |
| 905 config.dwICC = ICC_WIN95_CLASSES; | 914 config.dwICC = ICC_WIN95_CLASSES; |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1724 #if defined(OS_CHROMEOS) | 1733 #if defined(OS_CHROMEOS) |
| 1725 // To be precise, logout (browser shutdown) is not yet done, but the | 1734 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1726 // remaining work is negligible, hence we say LogoutDone here. | 1735 // remaining work is negligible, hence we say LogoutDone here. |
| 1727 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1736 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1728 false); | 1737 false); |
| 1729 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1738 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1730 #endif | 1739 #endif |
| 1731 TRACE_EVENT_END("BrowserMain", 0, 0); | 1740 TRACE_EVENT_END("BrowserMain", 0, 0); |
| 1732 return result_code; | 1741 return result_code; |
| 1733 } | 1742 } |
| OLD | NEW |