| OLD | NEW |
| 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/ui/views/frame/browser_frame.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 6 | 6 |
| 7 #include "chrome/browser/themes/theme_service.h" | 7 #include "chrome/browser/themes/theme_service.h" |
| 8 #include "chrome/browser/themes/theme_service_factory.h" | 8 #include "chrome/browser/themes/theme_service_factory.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_list.h" | 10 #include "chrome/browser/ui/browser_list.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 params.show_state = browser_view_->browser()->GetSavedWindowShowState(); | 52 params.show_state = browser_view_->browser()->GetSavedWindowShowState(); |
| 53 } | 53 } |
| 54 if (browser_view_->browser()->is_type_panel()) { | 54 if (browser_view_->browser()->is_type_panel()) { |
| 55 // We need to set the top-most bit when the panel window is created. | 55 // We need to set the top-most bit when the panel window is created. |
| 56 // There is a Windows bug/feature that would very likely prevent the window | 56 // There is a Windows bug/feature that would very likely prevent the window |
| 57 // from being changed to top-most after the window is created without | 57 // from being changed to top-most after the window is created without |
| 58 // activation. | 58 // activation. |
| 59 params.keep_on_top = true; | 59 params.keep_on_top = true; |
| 60 } | 60 } |
| 61 Init(params); | 61 Init(params); |
| 62 #if defined(OS_CHROMEOS) | 62 #if defined(OS_CHROMEOS) && !defined(USE_AURA) |
| 63 // On ChromeOS we always want top-level windows to appear active. | 63 // On ChromeOS we always want top-level windows to appear active. |
| 64 if (!browser_view_->IsBrowserTypePopup()) | 64 if (!browser_view_->IsBrowserTypePopup()) |
| 65 DisableInactiveRendering(); | 65 DisableInactiveRendering(); |
| 66 #endif | 66 #endif |
| 67 } | 67 } |
| 68 | 68 |
| 69 int BrowserFrame::GetMinimizeButtonOffset() const { | 69 int BrowserFrame::GetMinimizeButtonOffset() const { |
| 70 return native_browser_frame_->GetMinimizeButtonOffset(); | 70 return native_browser_frame_->GetMinimizeButtonOffset(); |
| 71 } | 71 } |
| 72 | 72 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // set ourselves as the last active browser window to ensure that we get | 146 // set ourselves as the last active browser window to ensure that we get |
| 147 // treated as such by the rest of Chrome. | 147 // treated as such by the rest of Chrome. |
| 148 BrowserList::SetLastActive(browser_view_->browser()); | 148 BrowserList::SetLastActive(browser_view_->browser()); |
| 149 } | 149 } |
| 150 Widget::OnNativeWidgetActivationChanged(active); | 150 Widget::OnNativeWidgetActivationChanged(active); |
| 151 } | 151 } |
| 152 | 152 |
| 153 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 153 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
| 154 return browser_frame_view_->GetAvatarMenuButton(); | 154 return browser_frame_view_->GetAvatarMenuButton(); |
| 155 } | 155 } |
| OLD | NEW |