| 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/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
| 8 #include "base/chromeos/chromeos_version.h" |
| 8 #include "chrome/browser/themes/theme_service.h" | 9 #include "chrome/browser/themes/theme_service.h" |
| 9 #include "chrome/browser/themes/theme_service_factory.h" | 10 #include "chrome/browser/themes/theme_service_factory.h" |
| 10 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_list.h" | 12 #include "chrome/browser/ui/browser_list.h" |
| 12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" | 13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |
| 13 #include "chrome/browser/ui/views/frame/browser_root_view.h" | 14 #include "chrome/browser/ui/views/frame/browser_root_view.h" |
| 14 #include "chrome/browser/ui/views/frame/browser_view.h" | 15 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 15 #include "chrome/browser/ui/views/frame/native_browser_frame.h" | 16 #include "chrome/browser/ui/views/frame/native_browser_frame.h" |
| 16 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 17 #include "ui/base/theme_provider.h" | 18 #include "ui/base/theme_provider.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 } | 95 } |
| 95 GetRootView()->Layout(); | 96 GetRootView()->Layout(); |
| 96 native_browser_frame_->TabStripDisplayModeChanged(); | 97 native_browser_frame_->TabStripDisplayModeChanged(); |
| 97 } | 98 } |
| 98 | 99 |
| 99 /////////////////////////////////////////////////////////////////////////////// | 100 /////////////////////////////////////////////////////////////////////////////// |
| 100 // BrowserFrame, views::Widget overrides: | 101 // BrowserFrame, views::Widget overrides: |
| 101 | 102 |
| 102 bool BrowserFrame::IsMaximized() const { | 103 bool BrowserFrame::IsMaximized() const { |
| 103 #if defined(OS_CHROMEOS) && !defined(USE_AURA) | 104 #if defined(OS_CHROMEOS) && !defined(USE_AURA) |
| 104 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) { | 105 if (base::chromeos::IsRunningOnChromeOS()) { |
| 105 return !IsFullscreen() && | 106 return !IsFullscreen() && |
| 106 (browser_view_->IsBrowserTypeNormal() || Widget::IsMaximized()); | 107 (browser_view_->IsBrowserTypeNormal() || Widget::IsMaximized()); |
| 107 } | 108 } |
| 108 #endif | 109 #endif |
| 109 return Widget::IsMaximized(); | 110 return Widget::IsMaximized(); |
| 110 } | 111 } |
| 111 | 112 |
| 112 views::internal::RootView* BrowserFrame::CreateRootView() { | 113 views::internal::RootView* BrowserFrame::CreateRootView() { |
| 113 root_view_ = new BrowserRootView(browser_view_, this); | 114 root_view_ = new BrowserRootView(browser_view_, this); |
| 114 return root_view_; | 115 return root_view_; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 // set ourselves as the last active browser window to ensure that we get | 148 // set ourselves as the last active browser window to ensure that we get |
| 148 // treated as such by the rest of Chrome. | 149 // treated as such by the rest of Chrome. |
| 149 BrowserList::SetLastActive(browser_view_->browser()); | 150 BrowserList::SetLastActive(browser_view_->browser()); |
| 150 } | 151 } |
| 151 Widget::OnNativeWidgetActivationChanged(active); | 152 Widget::OnNativeWidgetActivationChanged(active); |
| 152 } | 153 } |
| 153 | 154 |
| 154 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 155 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
| 155 return browser_frame_view_->avatar_button(); | 156 return browser_frame_view_->avatar_button(); |
| 156 } | 157 } |
| OLD | NEW |