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 "chrome/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 | 194 |
195 #if defined(TOOLKIT_USES_GTK) | 195 #if defined(TOOLKIT_USES_GTK) |
196 #include "ui/gfx/gtk_util.h" | 196 #include "ui/gfx/gtk_util.h" |
197 #endif | 197 #endif |
198 | 198 |
199 #if defined(TOUCH_UI) | 199 #if defined(TOUCH_UI) |
200 #include "ui/base/touch/touch_factory.h" | 200 #include "ui/base/touch/touch_factory.h" |
201 #endif | 201 #endif |
202 | 202 |
203 #if defined(USE_AURA) | 203 #if defined(USE_AURA) |
| 204 #include "chrome/browser/ui/aura/chrome_shell_delegate.h" |
204 #include "ui/aura/desktop.h" | 205 #include "ui/aura/desktop.h" |
205 #include "ui/aura_shell/shell.h" | 206 #include "ui/aura_shell/shell.h" |
206 #endif | 207 #endif |
207 | 208 |
208 namespace net { | 209 namespace net { |
209 class NetLog; | 210 class NetLog; |
210 } // namespace net | 211 } // namespace net |
211 | 212 |
212 namespace { | 213 namespace { |
213 | 214 |
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1362 | 1363 |
1363 // Convert active labs into switches. Modifies the current command line. | 1364 // Convert active labs into switches. Modifies the current command line. |
1364 about_flags::ConvertFlagsToSwitches(local_state, | 1365 about_flags::ConvertFlagsToSwitches(local_state, |
1365 CommandLine::ForCurrentProcess()); | 1366 CommandLine::ForCurrentProcess()); |
1366 | 1367 |
1367 // Reset the command line in the crash report details, since we may have | 1368 // Reset the command line in the crash report details, since we may have |
1368 // just changed it to include experiments. | 1369 // just changed it to include experiments. |
1369 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); | 1370 child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); |
1370 | 1371 |
1371 #if defined(USE_AURA) | 1372 #if defined(USE_AURA) |
1372 aura_shell::Shell::GetInstance(); | 1373 // Shell takes ownership of ChromeShellDelegate. |
| 1374 aura_shell::Shell::GetInstance()->SetDelegate(new ChromeShellDelegate); |
1373 #elif defined(TOOLKIT_VIEWS) | 1375 #elif defined(TOOLKIT_VIEWS) |
1374 views::Widget::SetPureViews( | 1376 views::Widget::SetPureViews( |
1375 CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews)); | 1377 CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews)); |
1376 // Launch the views desktop shell window and register it as the default parent | 1378 // Launch the views desktop shell window and register it as the default parent |
1377 // for all unparented views widgets. | 1379 // for all unparented views widgets. |
1378 if (parsed_command_line().HasSwitch(switches::kViewsDesktop)) { | 1380 if (parsed_command_line().HasSwitch(switches::kViewsDesktop)) { |
1379 std::string desktop_type_cmd = | 1381 std::string desktop_type_cmd = |
1380 parsed_command_line().GetSwitchValueASCII(switches::kViewsDesktop); | 1382 parsed_command_line().GetSwitchValueASCII(switches::kViewsDesktop); |
1381 if (desktop_type_cmd != "disabled") { | 1383 if (desktop_type_cmd != "disabled") { |
1382 views::desktop::DesktopWindowView::DesktopType desktop_type; | 1384 views::desktop::DesktopWindowView::DesktopType desktop_type; |
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2093 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && | 2095 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && |
2094 (pre_read == "0" || pre_read == "1")) { | 2096 (pre_read == "0" || pre_read == "1")) { |
2095 std::string uma_name(name); | 2097 std::string uma_name(name); |
2096 uma_name += "_PreRead"; | 2098 uma_name += "_PreRead"; |
2097 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 2099 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
2098 AddPreReadHistogramTime(uma_name.c_str(), time); | 2100 AddPreReadHistogramTime(uma_name.c_str(), time); |
2099 } | 2101 } |
2100 #endif | 2102 #endif |
2101 #endif | 2103 #endif |
2102 } | 2104 } |
OLD | NEW |