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

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

Issue 2272173002: Fix most chrome/browser/ui "gn check" problems. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 4 years, 3 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/location.h" 9 #include "base/location.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 54 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
55 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 55 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
56 #include "ui/views/widget/native_widget_aura.h" 56 #include "ui/views/widget/native_widget_aura.h"
57 #endif 57 #endif
58 58
59 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 59 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
60 #include "ui/views/linux_ui/linux_ui.h" 60 #include "ui/views/linux_ui/linux_ui.h"
61 #endif 61 #endif
62 62
63 #if defined(USE_ASH) 63 #if defined(USE_ASH)
64 #include "ash/common/accelerators/accelerator_controller.h" 64 #include "ash/common/accelerators/accelerator_controller.h" // nogncheck
65 #include "ash/common/wm/window_state.h" 65 #include "ash/common/wm/window_state.h" // nogncheck
66 #include "ash/common/wm_shell.h" 66 #include "ash/common/wm_shell.h" // nogncheck
67 #include "ash/shell.h" 67 #include "ash/shell.h" // nogncheck
68 #include "ash/wm/window_state_aura.h" 68 #include "ash/wm/window_state_aura.h" // nogncheck
69 #include "chrome/browser/ui/ash/ash_init.h" 69 #include "chrome/browser/ui/ash/ash_init.h" // nogncheck
70 #endif 70 #endif
71 71
72 // Helpers -------------------------------------------------------------------- 72 // Helpers --------------------------------------------------------------------
73 73
74 namespace { 74 namespace {
75 75
76 Profile* GetProfileForWindow(const views::Widget* window) { 76 Profile* GetProfileForWindow(const views::Widget* window) {
77 if (!window) 77 if (!window)
78 return NULL; 78 return NULL;
79 return reinterpret_cast<Profile*>( 79 return reinterpret_cast<Profile*>(
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 return content::BrowserThread::GetBlockingPool(); 506 return content::BrowserThread::GetBlockingPool();
507 } 507 }
508 508
509 #if !defined(USE_ASH) 509 #if !defined(USE_ASH)
510 views::Widget::InitParams::WindowOpacity 510 views::Widget::InitParams::WindowOpacity
511 ChromeViewsDelegate::GetOpacityForInitParams( 511 ChromeViewsDelegate::GetOpacityForInitParams(
512 const views::Widget::InitParams& params) { 512 const views::Widget::InitParams& params) {
513 return views::Widget::InitParams::OPAQUE_WINDOW; 513 return views::Widget::InitParams::OPAQUE_WINDOW;
514 } 514 }
515 #endif 515 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698