| 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" |
| 11 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" | 11 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |
| 12 #include "chrome/browser/ui/views/frame/browser_root_view.h" | 12 #include "chrome/browser/ui/views/frame/browser_root_view.h" |
| 13 #include "chrome/browser/ui/views/frame/browser_view.h" | 13 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 14 #include "chrome/browser/ui/views/frame/native_browser_frame.h" | 14 #include "chrome/browser/ui/views/frame/native_browser_frame.h" |
| 15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "ui/base/theme_provider.h" | 16 #include "ui/base/theme_provider.h" |
| 17 #include "ui/views/widget/native_widget.h" | 17 #include "views/widget/native_widget.h" |
| 18 | 18 |
| 19 #if defined(OS_WIN) && !defined(USE_AURA) | 19 #if defined(OS_WIN) && !defined(USE_AURA) |
| 20 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" | 20 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" |
| 21 #elif defined(OS_CHROMEOS) | 21 #elif defined(OS_CHROMEOS) |
| 22 #include "chrome/browser/chromeos/system/runtime_environment.h" | 22 #include "chrome/browser/chromeos/system/runtime_environment.h" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 //////////////////////////////////////////////////////////////////////////////// | 25 //////////////////////////////////////////////////////////////////////////////// |
| 26 // BrowserFrame, public: | 26 // BrowserFrame, public: |
| 27 | 27 |
| (...skipping 118 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_->avatar_button(); | 154 return browser_frame_view_->avatar_button(); |
| 155 } | 155 } |
| OLD | NEW |