| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/chromeos/chromeos_version.h" | 7 #include "base/chromeos/chromeos_version.h" |
| 8 #include "base/i18n/rtl.h" | 8 #include "base/i18n/rtl.h" |
| 9 #include "chrome/browser/themes/theme_service.h" | 9 #include "chrome/browser/themes/theme_service.h" |
| 10 #include "chrome/browser/themes/theme_service_factory.h" | 10 #include "chrome/browser/themes/theme_service_factory.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // treated as such by the rest of Chrome. | 146 // treated as such by the rest of Chrome. |
| 147 BrowserList::SetLastActive(browser_view_->browser()); | 147 BrowserList::SetLastActive(browser_view_->browser()); |
| 148 } | 148 } |
| 149 Widget::OnNativeWidgetActivationChanged(active); | 149 Widget::OnNativeWidgetActivationChanged(active); |
| 150 } | 150 } |
| 151 | 151 |
| 152 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 152 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
| 153 return browser_frame_view_->avatar_button(); | 153 return browser_frame_view_->avatar_button(); |
| 154 } | 154 } |
| 155 | 155 |
| 156 #if !defined(OS_WIN) | 156 #if !defined(OS_WIN) || defined(USE_AURA) |
| 157 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { | 157 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() { |
| 158 return !IsMaximized(); | 158 return !IsMaximized(); |
| 159 } | 159 } |
| 160 #endif // OS_WIN | 160 #endif // OS_WIN |
| OLD | NEW |