| 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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 } | 194 } |
| 195 | 195 |
| 196 void BrowserView2::AddViewToDropList(ChromeViews::View* view) { | 196 void BrowserView2::AddViewToDropList(ChromeViews::View* view) { |
| 197 dropable_views_.insert(view); | 197 dropable_views_.insert(view); |
| 198 } | 198 } |
| 199 | 199 |
| 200 bool BrowserView2::ActivateAppModalDialog() const { | 200 bool BrowserView2::ActivateAppModalDialog() const { |
| 201 // If another browser is app modal, flash and activate the modal browser. | 201 // If another browser is app modal, flash and activate the modal browser. |
| 202 if (BrowserList::IsShowingAppModalDialog()) { | 202 if (BrowserList::IsShowingAppModalDialog()) { |
| 203 if (browser_ != BrowserList::GetLastActive()) { | 203 if (browser_ != BrowserList::GetLastActive()) { |
| 204 CHECK(BrowserList::GetLastActive()); |
| 205 CHECK(BrowserList::GetLastActive()->window()); |
| 204 BrowserList::GetLastActive()->window()->FlashFrame(); | 206 BrowserList::GetLastActive()->window()->FlashFrame(); |
| 205 BrowserList::GetLastActive()->MoveToFront(true); | 207 BrowserList::GetLastActive()->MoveToFront(true); |
| 206 } | 208 } |
| 207 AppModalDialogQueue::ActivateModalDialog(); | 209 AppModalDialogQueue::ActivateModalDialog(); |
| 208 return true; | 210 return true; |
| 209 } | 211 } |
| 210 return false; | 212 return false; |
| 211 } | 213 } |
| 212 | 214 |
| 213 void BrowserView2::ActivationChanged(bool activated) { | 215 void BrowserView2::ActivationChanged(bool activated) { |
| (...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1194 // static | 1196 // static |
| 1195 void BrowserView2::InitClass() { | 1197 void BrowserView2::InitClass() { |
| 1196 static bool initialized = false; | 1198 static bool initialized = false; |
| 1197 if (!initialized) { | 1199 if (!initialized) { |
| 1198 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 1200 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 1199 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); | 1201 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); |
| 1200 initialized = true; | 1202 initialized = true; |
| 1201 } | 1203 } |
| 1202 } | 1204 } |
| 1203 | 1205 |
| OLD | NEW |