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

Side by Side Diff: chrome/browser/ui/views/chrome_views_delegate.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 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/chrome_views_delegate.h" 5 #include "chrome/browser/ui/views/chrome_views_delegate.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #endif 52 #endif
53 53
54 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 54 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
55 #include "ui/views/linux_ui/linux_ui.h" 55 #include "ui/views/linux_ui/linux_ui.h"
56 #endif 56 #endif
57 57
58 #if defined(USE_ASH) 58 #if defined(USE_ASH)
59 #include "ash/accelerators/accelerator_controller.h" 59 #include "ash/accelerators/accelerator_controller.h"
60 #include "ash/shell.h" 60 #include "ash/shell.h"
61 #include "ash/wm/window_state.h" 61 #include "ash/wm/window_state.h"
62 #include "ash/wm/window_state_aura.h"
62 #include "chrome/browser/ui/ash/ash_init.h" 63 #include "chrome/browser/ui/ash/ash_init.h"
63 #include "chrome/browser/ui/ash/ash_util.h" 64 #include "chrome/browser/ui/ash/ash_util.h"
64 #endif 65 #endif
65 66
66 // Helpers -------------------------------------------------------------------- 67 // Helpers --------------------------------------------------------------------
67 68
68 namespace { 69 namespace {
69 70
70 Profile* GetProfileForWindow(const views::Widget* window) { 71 Profile* GetProfileForWindow(const views::Widget* window) {
71 if (!window) 72 if (!window)
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 return content::BrowserThread::GetBlockingPool(); 498 return content::BrowserThread::GetBlockingPool();
498 } 499 }
499 500
500 #if !defined(USE_ASH) 501 #if !defined(USE_ASH)
501 views::Widget::InitParams::WindowOpacity 502 views::Widget::InitParams::WindowOpacity
502 ChromeViewsDelegate::GetOpacityForInitParams( 503 ChromeViewsDelegate::GetOpacityForInitParams(
503 const views::Widget::InitParams& params) { 504 const views::Widget::InitParams& params) {
504 return views::Widget::InitParams::OPAQUE_WINDOW; 505 return views::Widget::InitParams::OPAQUE_WINDOW;
505 } 506 }
506 #endif 507 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698