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/frame/browser_view.cc

Issue 2290753004: Finish changing chrome/ grit includes to use qualified paths. (Closed)
Patch Set: Rebase, fix new unqualified include 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 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 #include "components/app_modal/app_modal_dialog.h" 110 #include "components/app_modal/app_modal_dialog.h"
111 #include "components/app_modal/app_modal_dialog_queue.h" 111 #include "components/app_modal/app_modal_dialog_queue.h"
112 #include "components/app_modal/native_app_modal_dialog.h" 112 #include "components/app_modal/native_app_modal_dialog.h"
113 #include "components/omnibox/browser/omnibox_popup_model.h" 113 #include "components/omnibox/browser/omnibox_popup_model.h"
114 #include "components/omnibox/browser/omnibox_popup_view.h" 114 #include "components/omnibox/browser/omnibox_popup_view.h"
115 #include "components/omnibox/browser/omnibox_view.h" 115 #include "components/omnibox/browser/omnibox_view.h"
116 #include "components/prefs/pref_service.h" 116 #include "components/prefs/pref_service.h"
117 #include "components/sessions/core/tab_restore_service.h" 117 #include "components/sessions/core/tab_restore_service.h"
118 #include "components/signin/core/common/profile_management_switches.h" 118 #include "components/signin/core/common/profile_management_switches.h"
119 #include "components/translate/core/browser/language_state.h" 119 #include "components/translate/core/browser/language_state.h"
120 #include "content/app/resources/grit/content_resources.h"
121 #include "content/public/browser/download_manager.h" 120 #include "content/public/browser/download_manager.h"
122 #include "content/public/browser/notification_service.h" 121 #include "content/public/browser/notification_service.h"
123 #include "content/public/browser/render_frame_host.h" 122 #include "content/public/browser/render_frame_host.h"
124 #include "content/public/browser/render_view_host.h" 123 #include "content/public/browser/render_view_host.h"
125 #include "content/public/browser/render_widget_host_view.h" 124 #include "content/public/browser/render_widget_host_view.h"
126 #include "content/public/browser/user_metrics.h" 125 #include "content/public/browser/user_metrics.h"
127 #include "content/public/browser/web_contents.h" 126 #include "content/public/browser/web_contents.h"
128 #include "content/public/common/content_switches.h" 127 #include "content/public/common/content_switches.h"
129 #include "ui/accessibility/ax_view_state.h" 128 #include "ui/accessibility/ax_view_state.h"
130 #include "ui/base/accelerators/accelerator.h" 129 #include "ui/base/accelerators/accelerator.h"
(...skipping 2535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2666 } 2665 }
2667 2666
2668 extensions::ActiveTabPermissionGranter* 2667 extensions::ActiveTabPermissionGranter*
2669 BrowserView::GetActiveTabPermissionGranter() { 2668 BrowserView::GetActiveTabPermissionGranter() {
2670 content::WebContents* web_contents = GetActiveWebContents(); 2669 content::WebContents* web_contents = GetActiveWebContents();
2671 if (!web_contents) 2670 if (!web_contents)
2672 return nullptr; 2671 return nullptr;
2673 return extensions::TabHelper::FromWebContents(web_contents) 2672 return extensions::TabHelper::FromWebContents(web_contents)
2674 ->active_tab_permission_granter(); 2673 ->active_tab_permission_granter();
2675 } 2674 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698