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_aura.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
10 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" | 10 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 BrowserFrame* browser_frame_; | 89 BrowserFrame* browser_frame_; |
90 | 90 |
91 DISALLOW_COPY_AND_ASSIGN(WindowPropertyWatcher); | 91 DISALLOW_COPY_AND_ASSIGN(WindowPropertyWatcher); |
92 }; | 92 }; |
93 | 93 |
94 /////////////////////////////////////////////////////////////////////////////// | 94 /////////////////////////////////////////////////////////////////////////////// |
95 // BrowserFrameAura, public: | 95 // BrowserFrameAura, public: |
96 | 96 |
97 BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame, | 97 BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame, |
98 BrowserView* browser_view) | 98 BrowserView* browser_view) |
99 : views::NativeWidgetAura(browser_frame), | 99 : views::NativeWidgetAura(browser_frame, NULL), |
100 browser_view_(browser_view), | 100 browser_view_(browser_view), |
101 window_property_watcher_(new WindowPropertyWatcher(this, browser_frame)) { | 101 window_property_watcher_(new WindowPropertyWatcher(this, browser_frame)) { |
102 GetNativeWindow()->SetName("BrowserFrameAura"); | 102 GetNativeWindow()->SetName("BrowserFrameAura"); |
103 GetNativeWindow()->AddObserver(window_property_watcher_.get()); | 103 GetNativeWindow()->AddObserver(window_property_watcher_.get()); |
104 #if defined(USE_ASH) | 104 #if defined(USE_ASH) |
105 // Tabbed browsers and apps (some apps are TYPE_POPUP) get their own | 105 // Tabbed browsers and apps (some apps are TYPE_POPUP) get their own |
106 // workspace. | 106 // workspace. |
107 if (browser_view->browser()->type() != Browser::TYPE_POPUP || | 107 if (browser_view->browser()->type() != Browser::TYPE_POPUP || |
108 browser_view->browser()->is_app()) { | 108 browser_view->browser()->is_app()) { |
109 ash::SetPersistsAcrossAllWorkspaces( | 109 ash::SetPersistsAcrossAllWorkspaces( |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 return new DesktopBrowserFrameAura(browser_frame, browser_view); | 213 return new DesktopBrowserFrameAura(browser_frame, browser_view); |
214 #endif | 214 #endif |
215 return new BrowserFrameAura(browser_frame, browser_view); | 215 return new BrowserFrameAura(browser_frame, browser_view); |
216 } | 216 } |
217 | 217 |
218 /////////////////////////////////////////////////////////////////////////////// | 218 /////////////////////////////////////////////////////////////////////////////// |
219 // BrowserFrameAura, private: | 219 // BrowserFrameAura, private: |
220 | 220 |
221 BrowserFrameAura::~BrowserFrameAura() { | 221 BrowserFrameAura::~BrowserFrameAura() { |
222 } | 222 } |
OLD | NEW |