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

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

Issue 6788014: Fix DCHECK() in infobar animation. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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 (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/external_tab_container_win.h" 5 #include "chrome/browser/external_tab_container_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 932
933 AutomationExtensionFunction::Enable(tab_contents_->tab_contents(), 933 AutomationExtensionFunction::Enable(tab_contents_->tab_contents(),
934 functions_enabled); 934 functions_enabled);
935 enabled_extension_automation_ = true; 935 enabled_extension_automation_ = true;
936 } else { 936 } else {
937 AutomationExtensionFunction::Disable(); 937 AutomationExtensionFunction::Disable();
938 enabled_extension_automation_ = false; 938 enabled_extension_automation_ = false;
939 } 939 }
940 } 940 }
941 941
942 void ExternalTabContainer::InfoBarContainerSizeChanged(bool is_animating) { 942 void ExternalTabContainer::InfoBarContainerHeightChanged(bool is_animating) {
943 if (external_tab_view_) 943 if (external_tab_view_)
944 external_tab_view_->Layout(); 944 external_tab_view_->Layout();
945 } 945 }
946 946
947 // ExternalTabContainer instances do not have a window. 947 // ExternalTabContainer instances do not have a window.
948 views::Window* ExternalTabContainer::GetWindow() { 948 views::Window* ExternalTabContainer::GetWindow() {
949 return NULL; 949 return NULL;
950 } 950 }
951 951
952 bool ExternalTabContainer::AcceleratorPressed( 952 bool ExternalTabContainer::AcceleratorPressed(
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 1130
1131 if (disposition == CURRENT_TAB) { 1131 if (disposition == CURRENT_TAB) {
1132 DCHECK(route_all_top_level_navigations_); 1132 DCHECK(route_all_top_level_navigations_);
1133 disposition = NEW_FOREGROUND_TAB; 1133 disposition = NEW_FOREGROUND_TAB;
1134 } 1134 }
1135 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition, 1135 ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
1136 transition); 1136 transition);
1137 // support only one navigation for a dummy tab before it is killed. 1137 // support only one navigation for a dummy tab before it is killed.
1138 ::DestroyWindow(GetNativeView()); 1138 ::DestroyWindow(GetNativeView());
1139 } 1139 }
OLDNEW
« no previous file with comments | « chrome/browser/external_tab_container_win.h ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698