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

Side by Side Diff: ui/views/widget/native_widget_aura.cc

Issue 1927203003: Add support for X11 workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed GetSavedWindowWorkspace, put command line code into browser_frame.cc Created 4 years, 7 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 "ui/views/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 // alignment but preserve restored size and vertical offset for the time 389 // alignment but preserve restored size and vertical offset for the time
390 // when the |window_| gets undocked. 390 // when the |window_| gets undocked.
391 if (restore_bounds) { 391 if (restore_bounds) {
392 bounds.set_size(restore_bounds->size()); 392 bounds.set_size(restore_bounds->size());
393 bounds.set_y(restore_bounds->y()); 393 bounds.set_y(restore_bounds->y());
394 } 394 }
395 } 395 }
396 return bounds; 396 return bounds;
397 } 397 }
398 398
399 std::string NativeWidgetAura::GetWorkspace() const {
400 return std::string();
401 }
402
399 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) { 403 void NativeWidgetAura::SetBounds(const gfx::Rect& bounds) {
400 if (!window_) 404 if (!window_)
401 return; 405 return;
402 406
403 aura::Window* root = window_->GetRootWindow(); 407 aura::Window* root = window_->GetRootWindow();
404 if (root) { 408 if (root) {
405 aura::client::ScreenPositionClient* screen_position_client = 409 aura::client::ScreenPositionClient* screen_position_client =
406 aura::client::GetScreenPositionClient(root); 410 aura::client::GetScreenPositionClient(root);
407 if (screen_position_client) { 411 if (screen_position_client) {
408 gfx::Display dst_display = 412 gfx::Display dst_display =
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); 1175 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
1172 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); 1176 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
1173 return gfx::FontList(gfx::Font(caption_font.get())); 1177 return gfx::FontList(gfx::Font(caption_font.get()));
1174 #else 1178 #else
1175 return gfx::FontList(); 1179 return gfx::FontList();
1176 #endif 1180 #endif
1177 } 1181 }
1178 1182
1179 } // namespace internal 1183 } // namespace internal
1180 } // namespace views 1184 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698