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

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

Issue 249005: If IE was navigated away to a different page when the ChromeFrame inspector w... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/external_tab_container.h" 5 #include "chrome/browser/external_tab_container.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/win_util.h" 10 #include "app/win_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/win_util.h" 12 #include "base/win_util.h"
13 #include "chrome/browser/automation/automation_provider.h" 13 #include "chrome/browser/automation/automation_provider.h"
14 #include "chrome/browser/browser_window.h" 14 #include "chrome/browser/browser_window.h"
15 #include "chrome/browser/debugger/devtools_manager.h"
15 #include "chrome/browser/load_notification_details.h" 16 #include "chrome/browser/load_notification_details.h"
16 #include "chrome/browser/page_info_window.h" 17 #include "chrome/browser/page_info_window.h"
17 #include "chrome/browser/profile.h" 18 #include "chrome/browser/profile.h"
18 #include "chrome/browser/tab_contents/provisional_load_details.h" 19 #include "chrome/browser/tab_contents/provisional_load_details.h"
19 #include "chrome/browser/views/tab_contents/render_view_context_menu_external_wi n.h" 20 #include "chrome/browser/views/tab_contents/render_view_context_menu_external_wi n.h"
20 #include "chrome/browser/tab_contents/tab_contents.h" 21 #include "chrome/browser/tab_contents/tab_contents.h"
21 #include "chrome/browser/views/tab_contents/tab_contents_container.h" 22 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
22 #include "chrome/common/bindings_policy.h" 23 #include "chrome/common/bindings_policy.h"
23 #include "chrome/common/chrome_constants.h" 24 #include "chrome/common/chrome_constants.h"
24 #include "chrome/common/notification_service.h" 25 #include "chrome/common/notification_service.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 SetParent(GetNativeView(), parent); 149 SetParent(GetNativeView(), parent);
149 150
150 ::ShowWindow(tab_contents_->GetNativeView(), SW_SHOWNA); 151 ::ShowWindow(tab_contents_->GetNativeView(), SW_SHOWNA);
151 152
152 disabled_context_menu_ids_.push_back( 153 disabled_context_menu_ids_.push_back(
153 IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD); 154 IDS_CONTENT_CONTEXT_OPENLINKOFFTHERECORD);
154 return true; 155 return true;
155 } 156 }
156 157
157 void ExternalTabContainer::Uninitialize() { 158 void ExternalTabContainer::Uninitialize() {
159 RenderViewHost* rvh = tab_contents_->render_view_host();
160 if (rvh) {
161 DevToolsManager::GetInstance()->UnregisterDevToolsClientHostFor(rvh);
162 }
158 registrar_.RemoveAll(); 163 registrar_.RemoveAll();
159 if (tab_contents_) { 164 if (tab_contents_) {
160 NotificationService::current()->Notify( 165 NotificationService::current()->Notify(
161 NotificationType::EXTERNAL_TAB_CLOSED, 166 NotificationType::EXTERNAL_TAB_CLOSED,
162 Source<NavigationController>(&tab_contents_->controller()), 167 Source<NavigationController>(&tab_contents_->controller()),
163 Details<ExternalTabContainer>(this)); 168 Details<ExternalTabContainer>(this));
164 169
165 delete tab_contents_; 170 delete tab_contents_;
166 tab_contents_ = NULL; 171 tab_contents_ = NULL;
167 } 172 }
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 629
625 void ExternalTabContainer::Navigate(const GURL& url, const GURL& referrer) { 630 void ExternalTabContainer::Navigate(const GURL& url, const GURL& referrer) {
626 if (!tab_contents_) { 631 if (!tab_contents_) {
627 NOTREACHED(); 632 NOTREACHED();
628 return; 633 return;
629 } 634 }
630 635
631 tab_contents_->controller().LoadURL(url, referrer, 636 tab_contents_->controller().LoadURL(url, referrer,
632 PageTransition::START_PAGE); 637 PageTransition::START_PAGE);
633 } 638 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698