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

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

Issue 2148293003: Excluded non-chromeos source files in chromeos build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed failed test Created 4 years, 5 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 78 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
79 #include "chrome/browser/ui/views/frame/top_container_view.h" 79 #include "chrome/browser/ui/views/frame/top_container_view.h"
80 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 80 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
81 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" 81 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h"
82 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 82 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
83 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 83 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
84 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 84 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
85 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" 85 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
86 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h" 86 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
87 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 87 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
88 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
89 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" 88 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
90 #include "chrome/browser/ui/views/session_crashed_bubble_view.h" 89 #include "chrome/browser/ui/views/session_crashed_bubble_view.h"
91 #include "chrome/browser/ui/views/status_bubble_views.h" 90 #include "chrome/browser/ui/views/status_bubble_views.h"
92 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 91 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
93 #include "chrome/browser/ui/views/tabs/tab.h" 92 #include "chrome/browser/ui/views/tabs/tab.h"
94 #include "chrome/browser/ui/views/tabs/tab_strip.h" 93 #include "chrome/browser/ui/views/tabs/tab_strip.h"
95 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" 94 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
96 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 95 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
97 #include "chrome/browser/ui/views/toolbar/reload_button.h" 96 #include "chrome/browser/ui/views/toolbar/reload_button.h"
98 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 97 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #include "ui/views/controls/textfield/textfield.h" 147 #include "ui/views/controls/textfield/textfield.h"
149 #include "ui/views/controls/webview/webview.h" 148 #include "ui/views/controls/webview/webview.h"
150 #include "ui/views/focus/external_focus_tracker.h" 149 #include "ui/views/focus/external_focus_tracker.h"
151 #include "ui/views/focus/view_storage.h" 150 #include "ui/views/focus/view_storage.h"
152 #include "ui/views/layout/grid_layout.h" 151 #include "ui/views/layout/grid_layout.h"
153 #include "ui/views/widget/native_widget.h" 152 #include "ui/views/widget/native_widget.h"
154 #include "ui/views/widget/root_view.h" 153 #include "ui/views/widget/root_view.h"
155 #include "ui/views/widget/widget.h" 154 #include "ui/views/widget/widget.h"
156 #include "ui/views/window/dialog_delegate.h" 155 #include "ui/views/window/dialog_delegate.h"
157 156
157 #if !defined(OS_CHROMEOS)
158 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
159 #endif
160
158 #if defined(USE_ASH) 161 #if defined(USE_ASH)
159 #include "chrome/browser/ui/ash/ash_util.h" 162 #include "chrome/browser/ui/ash/ash_util.h"
160 #endif 163 #endif
161 164
162 #if defined(USE_AURA) 165 #if defined(USE_AURA)
163 #include "ui/aura/client/window_tree_client.h" 166 #include "ui/aura/client/window_tree_client.h"
164 #include "ui/aura/window.h" 167 #include "ui/aura/window.h"
165 #include "ui/aura/window_tree_host.h" 168 #include "ui/aura/window_tree_host.h"
166 #endif 169 #endif
167 170
(...skipping 2486 matching lines...) Expand 10 before | Expand all | Expand 10 after
2654 } 2657 }
2655 2658
2656 extensions::ActiveTabPermissionGranter* 2659 extensions::ActiveTabPermissionGranter*
2657 BrowserView::GetActiveTabPermissionGranter() { 2660 BrowserView::GetActiveTabPermissionGranter() {
2658 content::WebContents* web_contents = GetActiveWebContents(); 2661 content::WebContents* web_contents = GetActiveWebContents();
2659 if (!web_contents) 2662 if (!web_contents)
2660 return nullptr; 2663 return nullptr;
2661 return extensions::TabHelper::FromWebContents(web_contents) 2664 return extensions::TabHelper::FromWebContents(web_contents)
2662 ->active_tab_permission_granter(); 2665 ->active_tab_permission_granter();
2663 } 2666 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698