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_view.h" | 7 #include "chrome/browser/views/frame/browser_view.h" |
8 | 8 |
9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 } | 220 } |
221 | 221 |
222 int BrowserView::GetShowState() const { | 222 int BrowserView::GetShowState() const { |
223 if (explicit_show_state != -1) | 223 if (explicit_show_state != -1) |
224 return explicit_show_state; | 224 return explicit_show_state; |
225 | 225 |
226 STARTUPINFO si = {0}; | 226 STARTUPINFO si = {0}; |
227 si.cb = sizeof(si); | 227 si.cb = sizeof(si); |
228 si.dwFlags = STARTF_USESHOWWINDOW; | 228 si.dwFlags = STARTF_USESHOWWINDOW; |
229 GetStartupInfo(&si); | 229 GetStartupInfo(&si); |
230 // When launched from bash, for some reason si.wShowWindow is set to SW_HIDE, | 230 return si.wShowWindow; |
231 // so we need to correct that condition. | |
232 return si.wShowWindow == SW_HIDE ? SW_SHOWNORMAL : si.wShowWindow; | |
233 } | 231 } |
234 | 232 |
235 void BrowserView::WindowMoved() { | 233 void BrowserView::WindowMoved() { |
236 // Cancel any tabstrip animations, some of them may be invalidated by the | 234 // Cancel any tabstrip animations, some of them may be invalidated by the |
237 // window being repositioned. | 235 // window being repositioned. |
238 // Comment out for one cycle to see if this fixes dist tests. | 236 // Comment out for one cycle to see if this fixes dist tests. |
239 // tabstrip_->DestroyDragController(); | 237 // tabstrip_->DestroyDragController(); |
240 | 238 |
241 status_bubble_->Reposition(); | 239 status_bubble_->Reposition(); |
242 | 240 |
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1647 | 1645 |
1648 // static | 1646 // static |
1649 void BrowserView::InitClass() { | 1647 void BrowserView::InitClass() { |
1650 static bool initialized = false; | 1648 static bool initialized = false; |
1651 if (!initialized) { | 1649 if (!initialized) { |
1652 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 1650 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
1653 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); | 1651 default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); |
1654 initialized = true; | 1652 initialized = true; |
1655 } | 1653 } |
1656 } | 1654 } |
OLD | NEW |