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/command_line.h" | 7 #include "base/command_line.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 11 matching lines...) Expand all Loading... |
22 #if defined(OS_WIN) && !defined(USE_AURA) | 22 #if defined(OS_WIN) && !defined(USE_AURA) |
23 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" | 23 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" |
24 #elif defined(OS_CHROMEOS) | 24 #elif defined(OS_CHROMEOS) |
25 #include "chrome/browser/chromeos/system/runtime_environment.h" | 25 #include "chrome/browser/chromeos/system/runtime_environment.h" |
26 #endif | 26 #endif |
27 | 27 |
28 #if defined(USE_AURA) | 28 #if defined(USE_AURA) |
29 #include "ash/ash_switches.h" | 29 #include "ash/ash_switches.h" |
30 #include "ash/shell.h" | 30 #include "ash/shell.h" |
31 #include "chrome/browser/chromeos/status/status_area_view.h" | 31 #include "chrome/browser/chromeos/status/status_area_view.h" |
32 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" | 32 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" |
33 #endif | 33 #endif |
34 | 34 |
35 //////////////////////////////////////////////////////////////////////////////// | 35 //////////////////////////////////////////////////////////////////////////////// |
36 // BrowserFrame, public: | 36 // BrowserFrame, public: |
37 | 37 |
38 BrowserFrame::BrowserFrame(BrowserView* browser_view) | 38 BrowserFrame::BrowserFrame(BrowserView* browser_view) |
39 : native_browser_frame_(NULL), | 39 : native_browser_frame_(NULL), |
40 root_view_(NULL), | 40 root_view_(NULL), |
41 browser_frame_view_(NULL), | 41 browser_frame_view_(NULL), |
42 browser_view_(browser_view) { | 42 browser_view_(browser_view) { |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 // set ourselves as the last active browser window to ensure that we get | 225 // set ourselves as the last active browser window to ensure that we get |
226 // treated as such by the rest of Chrome. | 226 // treated as such by the rest of Chrome. |
227 BrowserList::SetLastActive(browser_view_->browser()); | 227 BrowserList::SetLastActive(browser_view_->browser()); |
228 } | 228 } |
229 Widget::OnNativeWidgetActivationChanged(active); | 229 Widget::OnNativeWidgetActivationChanged(active); |
230 } | 230 } |
231 | 231 |
232 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { | 232 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() { |
233 return browser_frame_view_->avatar_button(); | 233 return browser_frame_view_->avatar_button(); |
234 } | 234 } |
OLD | NEW |