Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // as such by the rest of Chrome. 232 // as such by the rest of Chrome.
233 BrowserList::SetLastActive(browser_view_->browser()); 233 BrowserList::SetLastActive(browser_view_->browser());
234 } else { 234 } else {
235 BrowserList::NotifyBrowserNoLongerActive(browser_view_->browser()); 235 BrowserList::NotifyBrowserNoLongerActive(browser_view_->browser());
236 } 236 }
237 Widget::OnNativeWidgetActivationChanged(active); 237 Widget::OnNativeWidgetActivationChanged(active);
238 } 238 }
239 239
240 void BrowserFrame::OnNativeWidgetWorkspaceChanged() { 240 void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
241 chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); 241 chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
242 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 242 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
243 BrowserList::MoveBrowsersInWorkspaceToFront( 243 BrowserList::MoveBrowsersInWorkspaceToFront(
244 views::X11DesktopHandler::get()->GetWorkspace()); 244 views::X11DesktopHandler::get()->GetWorkspace());
245 #endif 245 #endif
246 Widget::OnNativeWidgetWorkspaceChanged(); 246 Widget::OnNativeWidgetWorkspaceChanged();
247 } 247 }
248 248
249 void BrowserFrame::ShowContextMenuForView(views::View* source, 249 void BrowserFrame::ShowContextMenuForView(views::View* source,
250 const gfx::Point& p, 250 const gfx::Point& p,
251 ui::MenuSourceType source_type) { 251 ui::MenuSourceType source_type) {
252 if (chrome::IsRunningInForcedAppMode()) 252 if (chrome::IsRunningInForcedAppMode())
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 } 294 }
295 295
296 views::View* BrowserFrame::GetNewAvatarMenuButton() { 296 views::View* BrowserFrame::GetNewAvatarMenuButton() {
297 return browser_frame_view_->GetProfileSwitcherView(); 297 return browser_frame_view_->GetProfileSwitcherView();
298 } 298 }
299 299
300 void BrowserFrame::OnMenuClosed() { 300 void BrowserFrame::OnMenuClosed() {
301 menu_model_adapter_.reset(); 301 menu_model_adapter_.reset();
302 menu_runner_.reset(); 302 menu_runner_.reset();
303 } 303 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698