| OLD | NEW |
| 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/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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "chrome/browser/metrics/histogram_synchronizer.h" | 55 #include "chrome/browser/metrics/histogram_synchronizer.h" |
| 56 #include "chrome/browser/metrics/metrics_log.h" | 56 #include "chrome/browser/metrics/metrics_log.h" |
| 57 #include "chrome/browser/metrics/metrics_service.h" | 57 #include "chrome/browser/metrics/metrics_service.h" |
| 58 #include "chrome/browser/metrics/thread_watcher.h" | 58 #include "chrome/browser/metrics/thread_watcher.h" |
| 59 #include "chrome/browser/metrics/tracking_synchronizer.h" | 59 #include "chrome/browser/metrics/tracking_synchronizer.h" |
| 60 #include "chrome/browser/metrics/variations_service.h" | 60 #include "chrome/browser/metrics/variations_service.h" |
| 61 #include "chrome/browser/nacl_host/nacl_process_host.h" | 61 #include "chrome/browser/nacl_host/nacl_process_host.h" |
| 62 #include "chrome/browser/net/chrome_net_log.h" | 62 #include "chrome/browser/net/chrome_net_log.h" |
| 63 #include "chrome/browser/net/predictor.h" | 63 #include "chrome/browser/net/predictor.h" |
| 64 #include "chrome/browser/notifications/desktop_notification_service.h" | 64 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 65 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
| 65 #include "chrome/browser/page_cycler/page_cycler.h" | 66 #include "chrome/browser/page_cycler/page_cycler.h" |
| 66 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | |
| 67 #include "chrome/browser/plugin_prefs.h" | 67 #include "chrome/browser/plugin_prefs.h" |
| 68 #include "chrome/browser/prefs/pref_service.h" | 68 #include "chrome/browser/prefs/pref_service.h" |
| 69 #include "chrome/browser/prefs/pref_value_store.h" | 69 #include "chrome/browser/prefs/pref_value_store.h" |
| 70 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 70 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 71 #include "chrome/browser/prerender/prerender_field_trial.h" | 71 #include "chrome/browser/prerender/prerender_field_trial.h" |
| 72 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" | 72 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
| 73 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.
h" | 73 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.
h" |
| 74 #include "chrome/browser/process_singleton.h" | 74 #include "chrome/browser/process_singleton.h" |
| 75 #include "chrome/browser/profiles/profile.h" | 75 #include "chrome/browser/profiles/profile.h" |
| 76 #include "chrome/browser/profiles/profile_manager.h" | 76 #include "chrome/browser/profiles/profile_manager.h" |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 | 380 |
| 381 #if defined(OS_WIN) | 381 #if defined(OS_WIN) |
| 382 #if defined(USE_AURA) | 382 #if defined(USE_AURA) |
| 383 // TODO(beng): | 383 // TODO(beng): |
| 384 NOTIMPLEMENTED(); | 384 NOTIMPLEMENTED(); |
| 385 #else | 385 #else |
| 386 // Ideally, we should be able to run w/o access to disk. For now, we | 386 // Ideally, we should be able to run w/o access to disk. For now, we |
| 387 // prompt the user to pick a different user-data-dir and restart chrome | 387 // prompt the user to pick a different user-data-dir and restart chrome |
| 388 // with the new dir. | 388 // with the new dir. |
| 389 // http://code.google.com/p/chromium/issues/detail?id=11510 | 389 // http://code.google.com/p/chromium/issues/detail?id=11510 |
| 390 FilePath new_user_data_dir = browser::ShowUserDataDirDialog(user_data_dir); | 390 FilePath new_user_data_dir = chrome::ShowUserDataDirDialog(user_data_dir); |
| 391 | 391 |
| 392 if (!new_user_data_dir.empty()) { | 392 if (!new_user_data_dir.empty()) { |
| 393 // Because of the way CommandLine parses, it's sufficient to append a new | 393 // Because of the way CommandLine parses, it's sufficient to append a new |
| 394 // --user-data-dir switch. The last flag of the same name wins. | 394 // --user-data-dir switch. The last flag of the same name wins. |
| 395 // TODO(tc): It would be nice to remove the flag we don't want, but that | 395 // TODO(tc): It would be nice to remove the flag we don't want, but that |
| 396 // sounds risky if we parse differently than CommandLineToArgvW. | 396 // sounds risky if we parse differently than CommandLineToArgvW. |
| 397 CommandLine new_command_line = parameters.command_line; | 397 CommandLine new_command_line = parameters.command_line; |
| 398 new_command_line.AppendSwitchPath(switches::kUserDataDir, | 398 new_command_line.AppendSwitchPath(switches::kUserDataDir, |
| 399 new_user_data_dir); | 399 new_user_data_dir); |
| 400 base::LaunchProcess(new_command_line, base::LaunchOptions(), NULL); | 400 base::LaunchProcess(new_command_line, base::LaunchOptions(), NULL); |
| (...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2028 if (base::win::GetVersion() <= base::win::VERSION_XP) | 2028 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 2029 uma_name += "_XP"; | 2029 uma_name += "_XP"; |
| 2030 | 2030 |
| 2031 uma_name += "_PreRead_"; | 2031 uma_name += "_PreRead_"; |
| 2032 uma_name += pre_read_percentage; | 2032 uma_name += pre_read_percentage; |
| 2033 AddPreReadHistogramTime(uma_name.c_str(), time); | 2033 AddPreReadHistogramTime(uma_name.c_str(), time); |
| 2034 } | 2034 } |
| 2035 #endif | 2035 #endif |
| 2036 #endif | 2036 #endif |
| 2037 } | 2037 } |
| OLD | NEW |