| OLD | NEW |
| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 | 6 |
| 7 #include "chrome/browser/views/frame/browser_view2.h" | 7 #include "chrome/browser/views/frame/browser_view2.h" |
| 8 | 8 |
| 9 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
| 10 #include "chrome/app/theme/theme_resources.h" | 10 #include "chrome/app/theme/theme_resources.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 show_bookmark_bar_pref_.Init(prefs::kShowBookmarkBar, | 107 show_bookmark_bar_pref_.Init(prefs::kShowBookmarkBar, |
| 108 browser_->profile()->GetPrefs(), this); | 108 browser_->profile()->GetPrefs(), this); |
| 109 browser_->tabstrip_model()->AddObserver(this); | 109 browser_->tabstrip_model()->AddObserver(this); |
| 110 } | 110 } |
| 111 | 111 |
| 112 BrowserView2::~BrowserView2() { | 112 BrowserView2::~BrowserView2() { |
| 113 browser_->tabstrip_model()->RemoveObserver(this); | 113 browser_->tabstrip_model()->RemoveObserver(this); |
| 114 } | 114 } |
| 115 | 115 |
| 116 void BrowserView2::WindowMoved() { | 116 void BrowserView2::WindowMoved() { |
| 117 // Cancel any tabstrip animations, some of them may be invalidated by the |
| 118 // window being repositioned. |
| 119 tabstrip_->DestroyDragController(); |
| 120 |
| 117 status_bubble_->Reposition(); | 121 status_bubble_->Reposition(); |
| 118 | 122 |
| 119 // Close the omnibox popup, if any. | 123 // Close the omnibox popup, if any. |
| 120 if (GetLocationBarView()) | 124 if (GetLocationBarView()) |
| 121 GetLocationBarView()->location_entry()->ClosePopup(); | 125 GetLocationBarView()->location_entry()->ClosePopup(); |
| 122 } | 126 } |
| 123 | 127 |
| 124 gfx::Rect BrowserView2::GetToolbarBounds() const { | 128 gfx::Rect BrowserView2::GetToolbarBounds() const { |
| 125 return toolbar_->bounds(); | 129 return toolbar_->bounds(); |
| 126 } | 130 } |
| (...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1179 // static | 1183 // static |
| 1180 void BrowserView2::InitClass() { | 1184 void BrowserView2::InitClass() { |
| 1181 static bool initialized = false; | 1185 static bool initialized = false; |
| 1182 if (!initialized) { | 1186 if (!initialized) { |
| 1183 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 1187 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 1184 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); | 1188 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); |
| 1185 initialized = true; | 1189 initialized = true; |
| 1186 } | 1190 } |
| 1187 } | 1191 } |
| 1188 | 1192 |
| OLD | NEW |