Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: chrome/browser/ui/browser_init.cc

Issue 9360014: Create a content public browser API around the ChildProcessSecurityPolicy class. The implementati... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 10 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | content/browser/child_process_security_policy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/browser_init.h" 5 #include "chrome/browser/ui/browser_init.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "chrome/common/chrome_constants.h" 74 #include "chrome/common/chrome_constants.h"
75 #include "chrome/common/chrome_notification_types.h" 75 #include "chrome/common/chrome_notification_types.h"
76 #include "chrome/common/chrome_paths.h" 76 #include "chrome/common/chrome_paths.h"
77 #include "chrome/common/chrome_result_codes.h" 77 #include "chrome/common/chrome_result_codes.h"
78 #include "chrome/common/chrome_switches.h" 78 #include "chrome/common/chrome_switches.h"
79 #include "chrome/common/chrome_version_info.h" 79 #include "chrome/common/chrome_version_info.h"
80 #include "chrome/common/extensions/extension_constants.h" 80 #include "chrome/common/extensions/extension_constants.h"
81 #include "chrome/common/pref_names.h" 81 #include "chrome/common/pref_names.h"
82 #include "chrome/common/url_constants.h" 82 #include "chrome/common/url_constants.h"
83 #include "chrome/installer/util/browser_distribution.h" 83 #include "chrome/installer/util/browser_distribution.h"
84 #include "content/browser/child_process_security_policy.h"
85 #include "content/public/browser/browser_thread.h" 84 #include "content/public/browser/browser_thread.h"
85 #include "content/public/browser/child_process_security_policy.h"
86 #include "content/public/browser/navigation_details.h" 86 #include "content/public/browser/navigation_details.h"
87 #include "content/public/browser/web_contents.h" 87 #include "content/public/browser/web_contents.h"
88 #include "content/public/browser/web_contents_view.h" 88 #include "content/public/browser/web_contents_view.h"
89 #include "grit/chromium_strings.h" 89 #include "grit/chromium_strings.h"
90 #include "grit/generated_resources.h" 90 #include "grit/generated_resources.h"
91 #include "grit/locale_settings.h" 91 #include "grit/locale_settings.h"
92 #include "grit/theme_resources.h" 92 #include "grit/theme_resources.h"
93 #include "grit/theme_resources_standard.h" 93 #include "grit/theme_resources_standard.h"
94 #include "net/base/net_util.h" 94 #include "net/base/net_util.h"
95 #include "ui/base/l10n/l10n_util.h" 95 #include "ui/base/l10n/l10n_util.h"
(...skipping 25 matching lines...) Expand all
121 121
122 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 122 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
123 #include "ui/base/touch/touch_factory.h" 123 #include "ui/base/touch/touch_factory.h"
124 #endif 124 #endif
125 125
126 #if defined(OS_WIN) 126 #if defined(OS_WIN)
127 #include "chrome/installer/util/auto_launch_util.h" 127 #include "chrome/installer/util/auto_launch_util.h"
128 #endif 128 #endif
129 129
130 using content::BrowserThread; 130 using content::BrowserThread;
131 using content::ChildProcessSecurityPolicy;
131 using content::OpenURLParams; 132 using content::OpenURLParams;
132 using content::Referrer; 133 using content::Referrer;
133 using content::WebContents; 134 using content::WebContents;
134 135
135 namespace { 136 namespace {
136 137
137 static const int kMaxInfobarShown = 5; 138 static const int kMaxInfobarShown = 5;
138 139
139 #if defined(OS_WIN) 140 #if defined(OS_WIN)
140 // The delegate for the infobar shown when Chrome was auto-launched. 141 // The delegate for the infobar shown when Chrome was auto-launched.
(...skipping 1708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1849 1850
1850 Profile* profile = ProfileManager::GetLastUsedProfile(); 1851 Profile* profile = ProfileManager::GetLastUsedProfile();
1851 if (!profile) { 1852 if (!profile) {
1852 // We should only be able to get here if the profile already exists and 1853 // We should only be able to get here if the profile already exists and
1853 // has been created. 1854 // has been created.
1854 NOTREACHED(); 1855 NOTREACHED();
1855 return; 1856 return;
1856 } 1857 }
1857 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL); 1858 ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
1858 } 1859 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | content/browser/child_process_security_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698