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

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

Issue 2438853002: Renames aura::client::WindowTreeClient to WindowParentingClient (Closed)
Patch Set: cleanup 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 #if !defined(OS_CHROMEOS) 153 #if !defined(OS_CHROMEOS)
154 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h" 154 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
155 #endif 155 #endif
156 156
157 #if defined(USE_ASH) 157 #if defined(USE_ASH)
158 #include "chrome/browser/ui/ash/ash_util.h" 158 #include "chrome/browser/ui/ash/ash_util.h"
159 #endif 159 #endif
160 160
161 #if defined(USE_AURA) 161 #if defined(USE_AURA)
162 #include "ui/aura/client/window_tree_client.h" 162 #include "ui/aura/client/window_parenting_client.h"
163 #include "ui/aura/window.h" 163 #include "ui/aura/window.h"
164 #include "ui/aura/window_tree_host.h" 164 #include "ui/aura/window_tree_host.h"
165 #endif 165 #endif
166 166
167 #if defined(OS_WIN) 167 #if defined(OS_WIN)
168 #include "base/win/windows_version.h" 168 #include "base/win/windows_version.h"
169 #include "chrome/browser/win/jumplist.h" 169 #include "chrome/browser/win/jumplist.h"
170 #include "chrome/browser/win/jumplist_factory.h" 170 #include "chrome/browser/win/jumplist_factory.h"
171 #include "ui/gfx/color_palette.h" 171 #include "ui/gfx/color_palette.h"
172 #include "ui/native_theme/native_theme_dark_win.h" 172 #include "ui/native_theme/native_theme_dark_win.h"
(...skipping 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after
2636 } 2636 }
2637 2637
2638 extensions::ActiveTabPermissionGranter* 2638 extensions::ActiveTabPermissionGranter*
2639 BrowserView::GetActiveTabPermissionGranter() { 2639 BrowserView::GetActiveTabPermissionGranter() {
2640 content::WebContents* web_contents = GetActiveWebContents(); 2640 content::WebContents* web_contents = GetActiveWebContents();
2641 if (!web_contents) 2641 if (!web_contents)
2642 return nullptr; 2642 return nullptr;
2643 return extensions::TabHelper::FromWebContents(web_contents) 2643 return extensions::TabHelper::FromWebContents(web_contents)
2644 ->active_tab_permission_granter(); 2644 ->active_tab_permission_granter();
2645 } 2645 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698