chrome/browser/ui/startup/bad_flags_prompt.cc - Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator.

Side by Side Diff: chrome/browser/ui/startup/bad_flags_prompt.cc

Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator. (Closed)

Patch Set: Fix merge Created 3 years, 6 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:

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc ('k') | chrome/browser/ui/views/payments/payment_request_browsertest_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/ui/startup/bad_flags_prompt.h"	5 #include "chrome/browser/ui/startup/bad_flags_prompt.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/files/file_path.h"	8 #include "base/files/file_path.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "build/build_config.h"	10 #include "build/build_config.h"

11 #include "chrome/browser/infobars/infobar_service.h"	11 #include "chrome/browser/infobars/infobar_service.h"

12 #include "chrome/browser/ui/browser.h"	12 #include "chrome/browser/ui/browser.h"

13 #include "chrome/browser/ui/simple_message_box.h"	13 #include "chrome/browser/ui/simple_message_box.h"

14 #include "chrome/browser/ui/tabs/tab_strip_model.h"	14 #include "chrome/browser/ui/tabs/tab_strip_model.h"

15 #include "chrome/common/chrome_paths.h"	15 #include "chrome/common/chrome_paths.h"

16 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

17 #include "chrome/common/switch_utils.h"	17 #include "chrome/common/switch_utils.h"

18 #include "chrome/grit/chromium_strings.h"	18 #include "chrome/grit/chromium_strings.h"

19 #include "chrome/grit/generated_resources.h"	19 #include "chrome/grit/generated_resources.h"

20 #include "components/autofill/core/common/autofill_switches.h"	20 #include "components/autofill/core/common/autofill_switches.h"

21 #include "components/infobars/core/infobar_delegate.h"	21 #include "components/infobars/core/infobar_delegate.h"

22 #include "components/infobars/core/simple_alert_infobar_delegate.h"	22 #include "components/infobars/core/simple_alert_infobar_delegate.h"

23 #include "components/invalidation/impl/invalidation_switches.h"	23 #include "components/invalidation/impl/invalidation_switches.h"

24 #include "components/nacl/common/nacl_switches.h"	24 #include "components/nacl/common/nacl_switches.h"

	25 #include "components/network_session_configurator/common/network_switches.h"

25 #include "components/startup_metric_utils/browser/startup_metric_utils.h"	26 #include "components/startup_metric_utils/browser/startup_metric_utils.h"

26 #include "components/translate/core/common/translate_switches.h"	27 #include "components/translate/core/common/translate_switches.h"

27 #include "content/public/common/content_switches.h"	28 #include "content/public/common/content_switches.h"

28 #include "extensions/common/switches.h"	29 #include "extensions/common/switches.h"

29 #include "google_apis/gaia/gaia_switches.h"	30 #include "google_apis/gaia/gaia_switches.h"

30 #include "media/base/media_switches.h"	31 #include "media/base/media_switches.h"

31 #include "media/media_features.h"	32 #include "media/media_features.h"

32 #include "ui/base/l10n/l10n_util.h"	33 #include "ui/base/l10n/l10n_util.h"

33 #include "ui/base/resource/resource_bundle.h"	34 #include "ui/base/resource/resource_bundle.h"

34	35

(...skipping 104 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 user_data_dir.LossyDisplayName());	140 user_data_dir.LossyDisplayName());

140	141

141 if (cleanup_resource_bundle)	142 if (cleanup_resource_bundle)

142 ResourceBundle::CleanupSharedInstance();	143 ResourceBundle::CleanupSharedInstance();

143	144

144 // More complex dialogs cannot be shown before the earliest calls here.	145 // More complex dialogs cannot be shown before the earliest calls here.

145 ShowWarningMessageBox(NULL, title, message);	146 ShowWarningMessageBox(NULL, title, message);

146 }	147 }

147	148

148 } // namespace chrome	149 } // namespace chrome

OLD	NEW