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

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

Issue 19894003: Move webplugininfo.h to content/public. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #include "content/public/browser/render_process_host.h" 163 #include "content/public/browser/render_process_host.h"
164 #include "content/public/browser/render_view_host.h" 164 #include "content/public/browser/render_view_host.h"
165 #include "content/public/browser/site_instance.h" 165 #include "content/public/browser/site_instance.h"
166 #include "content/public/browser/user_metrics.h" 166 #include "content/public/browser/user_metrics.h"
167 #include "content/public/browser/web_contents.h" 167 #include "content/public/browser/web_contents.h"
168 #include "content/public/browser/web_contents_view.h" 168 #include "content/public/browser/web_contents_view.h"
169 #include "content/public/common/content_restriction.h" 169 #include "content/public/common/content_restriction.h"
170 #include "content/public/common/content_switches.h" 170 #include "content/public/common/content_switches.h"
171 #include "content/public/common/page_zoom.h" 171 #include "content/public/common/page_zoom.h"
172 #include "content/public/common/renderer_preferences.h" 172 #include "content/public/common/renderer_preferences.h"
173 #include "content/public/common/webplugininfo.h"
173 #include "extensions/common/constants.h" 174 #include "extensions/common/constants.h"
174 #include "grit/chromium_strings.h" 175 #include "grit/chromium_strings.h"
175 #include "grit/generated_resources.h" 176 #include "grit/generated_resources.h"
176 #include "grit/locale_settings.h" 177 #include "grit/locale_settings.h"
177 #include "grit/theme_resources.h" 178 #include "grit/theme_resources.h"
178 #include "net/base/net_util.h" 179 #include "net/base/net_util.h"
179 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 180 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
180 #include "net/cookies/cookie_monster.h" 181 #include "net/cookies/cookie_monster.h"
181 #include "net/url_request/url_request_context.h" 182 #include "net/url_request/url_request_context.h"
182 #include "ui/base/l10n/l10n_util.h" 183 #include "ui/base/l10n/l10n_util.h"
183 #include "ui/base/window_open_disposition.h" 184 #include "ui/base/window_open_disposition.h"
184 #include "ui/gfx/point.h" 185 #include "ui/gfx/point.h"
185 #include "ui/shell_dialogs/selected_file_info.h" 186 #include "ui/shell_dialogs/selected_file_info.h"
186 #include "webkit/plugins/webplugininfo.h"
187 187
188 #if defined(OS_WIN) 188 #if defined(OS_WIN)
189 #include "base/win/metro.h" 189 #include "base/win/metro.h"
190 #include "chrome/browser/shell_integration.h" 190 #include "chrome/browser/shell_integration.h"
191 #include "chrome/browser/ssl/ssl_error_info.h" 191 #include "chrome/browser/ssl/ssl_error_info.h"
192 #include "chrome/browser/task_manager/task_manager.h" 192 #include "chrome/browser/task_manager/task_manager.h"
193 #include "chrome/browser/ui/view_ids.h" 193 #include "chrome/browser/ui/view_ids.h"
194 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" 194 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
195 #include "ui/base/win/shell.h" 195 #include "ui/base/win/shell.h"
196 #include "ui/views/win/hwnd_util.h" 196 #include "ui/views/win/hwnd_util.h"
(...skipping 2066 matching lines...) Expand 10 before | Expand all | Expand 10 after
2263 if (contents && !allow_js_access) { 2263 if (contents && !allow_js_access) {
2264 contents->web_contents()->GetController().LoadURL( 2264 contents->web_contents()->GetController().LoadURL(
2265 target_url, 2265 target_url,
2266 content::Referrer(), 2266 content::Referrer(),
2267 content::PAGE_TRANSITION_LINK, 2267 content::PAGE_TRANSITION_LINK,
2268 std::string()); // No extra headers. 2268 std::string()); // No extra headers.
2269 } 2269 }
2270 2270
2271 return contents != NULL; 2271 return contents != NULL;
2272 } 2272 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698