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

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

Issue 9006036: Create an API around PluginService and use it from Chrome. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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 (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/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 // OS_WIN 10 #endif // OS_WIN
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 #include "chrome/common/extensions/extension.h" 135 #include "chrome/common/extensions/extension.h"
136 #include "chrome/common/extensions/extension_constants.h" 136 #include "chrome/common/extensions/extension_constants.h"
137 #include "chrome/common/pref_names.h" 137 #include "chrome/common/pref_names.h"
138 #include "chrome/common/profiling.h" 138 #include "chrome/common/profiling.h"
139 #include "chrome/common/url_constants.h" 139 #include "chrome/common/url_constants.h"
140 #include "chrome/common/web_apps.h" 140 #include "chrome/common/web_apps.h"
141 #include "content/browser/browser_url_handler.h" 141 #include "content/browser/browser_url_handler.h"
142 #include "content/browser/child_process_security_policy.h" 142 #include "content/browser/child_process_security_policy.h"
143 #include "content/browser/download/save_package.h" 143 #include "content/browser/download/save_package.h"
144 #include "content/browser/host_zoom_map.h" 144 #include "content/browser/host_zoom_map.h"
145 #include "content/browser/plugin_service.h"
146 #include "content/browser/renderer_host/render_view_host.h" 145 #include "content/browser/renderer_host/render_view_host.h"
147 #include "content/browser/site_instance.h" 146 #include "content/browser/site_instance.h"
148 #include "content/browser/tab_contents/interstitial_page.h" 147 #include "content/browser/tab_contents/interstitial_page.h"
149 #include "content/browser/tab_contents/navigation_controller.h" 148 #include "content/browser/tab_contents/navigation_controller.h"
150 #include "content/browser/tab_contents/navigation_entry.h" 149 #include "content/browser/tab_contents/navigation_entry.h"
151 #include "content/browser/tab_contents/tab_contents.h" 150 #include "content/browser/tab_contents/tab_contents.h"
152 #include "content/browser/tab_contents/tab_contents_view.h" 151 #include "content/browser/tab_contents/tab_contents_view.h"
153 #include "content/public/browser/devtools_manager.h" 152 #include "content/public/browser/devtools_manager.h"
154 #include "content/public/browser/download_item.h" 153 #include "content/public/browser/download_item.h"
155 #include "content/public/browser/download_manager.h" 154 #include "content/public/browser/download_manager.h"
156 #include "content/public/browser/intents_host.h" 155 #include "content/public/browser/intents_host.h"
157 #include "content/public/browser/notification_details.h" 156 #include "content/public/browser/notification_details.h"
158 #include "content/public/browser/notification_service.h" 157 #include "content/public/browser/notification_service.h"
158 #include "content/public/browser/plugin_service.h"
159 #include "content/public/browser/user_metrics.h" 159 #include "content/public/browser/user_metrics.h"
160 #include "content/public/common/content_restriction.h" 160 #include "content/public/common/content_restriction.h"
161 #include "content/public/common/content_switches.h" 161 #include "content/public/common/content_switches.h"
162 #include "content/public/common/page_zoom.h" 162 #include "content/public/common/page_zoom.h"
163 #include "grit/chromium_strings.h" 163 #include "grit/chromium_strings.h"
164 #include "grit/generated_resources.h" 164 #include "grit/generated_resources.h"
165 #include "grit/locale_settings.h" 165 #include "grit/locale_settings.h"
166 #include "grit/theme_resources_standard.h" 166 #include "grit/theme_resources_standard.h"
167 #include "net/base/cookie_monster.h" 167 #include "net/base/cookie_monster.h"
168 #include "net/base/net_util.h" 168 #include "net/base/net_util.h"
169 #include "net/base/registry_controlled_domain.h" 169 #include "net/base/registry_controlled_domain.h"
170 #include "net/url_request/url_request_context.h" 170 #include "net/url_request/url_request_context.h"
171 #include "ui/base/animation/animation.h" 171 #include "ui/base/animation/animation.h"
172 #include "ui/base/l10n/l10n_util.h" 172 #include "ui/base/l10n/l10n_util.h"
173 #include "ui/gfx/point.h" 173 #include "ui/gfx/point.h"
174 #include "webkit/glue/web_intent_data.h" 174 #include "webkit/glue/web_intent_data.h"
175 #include "webkit/glue/webkit_glue.h" 175 #include "webkit/glue/webkit_glue.h"
176 #include "webkit/glue/window_open_disposition.h" 176 #include "webkit/glue/window_open_disposition.h"
177 #include "webkit/plugins/webplugininfo.h"
177 178
178 #if defined(OS_WIN) 179 #if defined(OS_WIN)
179 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" 180 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
180 #include "chrome/browser/shell_integration.h" 181 #include "chrome/browser/shell_integration.h"
181 #include "chrome/browser/ssl/ssl_error_info.h" 182 #include "chrome/browser/ssl/ssl_error_info.h"
182 #include "chrome/browser/task_manager/task_manager.h" 183 #include "chrome/browser/task_manager/task_manager.h"
183 #include "chrome/browser/ui/view_ids.h" 184 #include "chrome/browser/ui/view_ids.h"
184 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 185 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
185 #include "ui/base/win/shell.h" 186 #include "ui/base/win/shell.h"
186 #endif // OS_WIN 187 #endif // OS_WIN
(...skipping 11 matching lines...) Expand all
198 199
199 #if !defined(OS_CHROMEOS) || defined(USE_AURA) 200 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
200 #include "chrome/browser/download/download_shelf.h" 201 #include "chrome/browser/download/download_shelf.h"
201 #endif 202 #endif
202 203
203 #if defined(FILE_MANAGER_EXTENSION) 204 #if defined(FILE_MANAGER_EXTENSION)
204 #include "chrome/browser/extensions/file_manager_util.h" 205 #include "chrome/browser/extensions/file_manager_util.h"
205 #endif 206 #endif
206 207
207 using base::TimeDelta; 208 using base::TimeDelta;
209 using content::PluginService;
208 using content::UserMetricsAction; 210 using content::UserMetricsAction;
209 211
210 /////////////////////////////////////////////////////////////////////////////// 212 ///////////////////////////////////////////////////////////////////////////////
211 213
212 namespace { 214 namespace {
213 215
214 // The URL to be loaded to display Help. 216 // The URL to be loaded to display Help.
215 const char kHelpContentUrl[] = 217 const char kHelpContentUrl[] =
216 #if defined(OS_CHROMEOS) 218 #if defined(OS_CHROMEOS)
217 #if defined(OFFICIAL_BUILD) 219 #if defined(OFFICIAL_BUILD)
(...skipping 5131 matching lines...) Expand 10 before | Expand all | Expand 10 after
5349 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5351 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5350 } else { 5352 } else {
5351 GlobalErrorService* service = 5353 GlobalErrorService* service =
5352 GlobalErrorServiceFactory::GetForProfile(profile()); 5354 GlobalErrorServiceFactory::GetForProfile(profile());
5353 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5355 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5354 if (error) { 5356 if (error) {
5355 error->ShowBubbleView(this); 5357 error->ShowBubbleView(this);
5356 } 5358 }
5357 } 5359 }
5358 } 5360 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698