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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/leak_annotations.h" | 10 #include "base/debug/leak_annotations.h" |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 // as such by the rest of Chrome. | 231 // as such by the rest of Chrome. |
232 BrowserList::SetLastActive(browser_view_->browser()); | 232 BrowserList::SetLastActive(browser_view_->browser()); |
233 } else { | 233 } else { |
234 BrowserList::NotifyBrowserNoLongerActive(browser_view_->browser()); | 234 BrowserList::NotifyBrowserNoLongerActive(browser_view_->browser()); |
235 } | 235 } |
236 Widget::OnNativeWidgetActivationChanged(active); | 236 Widget::OnNativeWidgetActivationChanged(active); |
237 } | 237 } |
238 | 238 |
239 void BrowserFrame::OnNativeWidgetWorkspaceChanged() { | 239 void BrowserFrame::OnNativeWidgetWorkspaceChanged() { |
240 chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); | 240 chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); |
241 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 241 #if !defined(OS_CHROMEOS) && defined(USE_X11) |
242 BrowserList::MoveBrowsersInWorkspaceToFront( | 242 BrowserList::MoveBrowsersInWorkspaceToFront( |
243 views::X11DesktopHandler::get()->GetWorkspace()); | 243 views::X11DesktopHandler::get()->GetWorkspace()); |
244 #endif | 244 #endif |
245 Widget::OnNativeWidgetWorkspaceChanged(); | 245 Widget::OnNativeWidgetWorkspaceChanged(); |
246 } | 246 } |
247 | 247 |
248 void BrowserFrame::ShowContextMenuForView(views::View* source, | 248 void BrowserFrame::ShowContextMenuForView(views::View* source, |
249 const gfx::Point& p, | 249 const gfx::Point& p, |
250 ui::MenuSourceType source_type) { | 250 ui::MenuSourceType source_type) { |
251 if (chrome::IsRunningInForcedAppMode()) | 251 if (chrome::IsRunningInForcedAppMode()) |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 return menu_model_builder_->menu_model(); | 290 return menu_model_builder_->menu_model(); |
291 } | 291 } |
292 | 292 |
293 views::View* BrowserFrame::GetNewAvatarMenuButton() { | 293 views::View* BrowserFrame::GetNewAvatarMenuButton() { |
294 return browser_frame_view_->GetProfileSwitcherView(); | 294 return browser_frame_view_->GetProfileSwitcherView(); |
295 } | 295 } |
296 | 296 |
297 void BrowserFrame::OnMenuClosed() { | 297 void BrowserFrame::OnMenuClosed() { |
298 menu_runner_.reset(); | 298 menu_runner_.reset(); |
299 } | 299 } |
OLD | NEW |