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

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

Issue 10968043: Switch HungPluginTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « no previous file | chrome/browser/ui/hung_plugin_tab_helper.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.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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 #include "chrome/browser/ui/chrome_pages.h" 112 #include "chrome/browser/ui/chrome_pages.h"
113 #include "chrome/browser/ui/chrome_select_file_policy.h" 113 #include "chrome/browser/ui/chrome_select_file_policy.h"
114 #include "chrome/browser/ui/extensions/shell_window.h" 114 #include "chrome/browser/ui/extensions/shell_window.h"
115 #include "chrome/browser/ui/find_bar/find_bar.h" 115 #include "chrome/browser/ui/find_bar/find_bar.h"
116 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 116 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
117 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 117 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
118 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 118 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
119 #include "chrome/browser/ui/global_error/global_error.h" 119 #include "chrome/browser/ui/global_error/global_error.h"
120 #include "chrome/browser/ui/global_error/global_error_service.h" 120 #include "chrome/browser/ui/global_error/global_error_service.h"
121 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 121 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
122 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
123 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" 122 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
124 #include "chrome/browser/ui/media_stream_infobar_delegate.h" 123 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
125 #include "chrome/browser/ui/omnibox/location_bar.h" 124 #include "chrome/browser/ui/omnibox/location_bar.h"
126 #include "chrome/browser/ui/search/search.h" 125 #include "chrome/browser/ui/search/search.h"
127 #include "chrome/browser/ui/search/search_delegate.h" 126 #include "chrome/browser/ui/search/search_delegate.h"
128 #include "chrome/browser/ui/search/search_model.h" 127 #include "chrome/browser/ui/search/search_model.h"
129 #include "chrome/browser/ui/singleton_tabs.h" 128 #include "chrome/browser/ui/singleton_tabs.h"
130 #include "chrome/browser/ui/status_bubble.h" 129 #include "chrome/browser/ui/status_bubble.h"
131 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h" 130 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
132 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 131 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
(...skipping 2153 matching lines...) Expand 10 before | Expand all | Expand 10 after
2286 if (contents && !allow_js_access) { 2285 if (contents && !allow_js_access) {
2287 contents->web_contents()->GetController().LoadURL( 2286 contents->web_contents()->GetController().LoadURL(
2288 target_url, 2287 target_url,
2289 content::Referrer(), 2288 content::Referrer(),
2290 content::PAGE_TRANSITION_LINK, 2289 content::PAGE_TRANSITION_LINK,
2291 std::string()); // No extra headers. 2290 std::string()); // No extra headers.
2292 } 2291 }
2293 2292
2294 return contents != NULL; 2293 return contents != NULL;
2295 } 2294 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/hung_plugin_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698