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

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

Issue 2656213002: Makes SessionCrashedBubbleView work on chromeos (Closed)
Patch Set: consent works on chromeos Created 3 years, 10 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" 74 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
75 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h" 75 #include "chrome/browser/ui/views/ime/ime_warning_bubble_view.h"
76 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" 76 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
77 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 77 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
78 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" 78 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
79 #include "chrome/browser/ui/views/location_bar/star_view.h" 79 #include "chrome/browser/ui/views/location_bar/star_view.h"
80 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h" 80 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
81 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h" 81 #include "chrome/browser/ui/views/new_back_shortcut_bubble.h"
82 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 82 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
83 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h" 83 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
84 #include "chrome/browser/ui/views/session_crashed_bubble_view.h"
85 #include "chrome/browser/ui/views/status_bubble_views.h" 84 #include "chrome/browser/ui/views/status_bubble_views.h"
86 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 85 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
87 #include "chrome/browser/ui/views/tabs/tab.h" 86 #include "chrome/browser/ui/views/tabs/tab.h"
88 #include "chrome/browser/ui/views/tabs/tab_strip.h" 87 #include "chrome/browser/ui/views/tabs/tab_strip.h"
89 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" 88 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
90 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 89 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
91 #include "chrome/browser/ui/views/toolbar/reload_button.h" 90 #include "chrome/browser/ui/views/toolbar/reload_button.h"
92 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 91 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
93 #include "chrome/browser/ui/views/translate/translate_bubble_view.h" 92 #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
94 #include "chrome/browser/ui/views/update_recommended_message_box.h" 93 #include "chrome/browser/ui/views/update_recommended_message_box.h"
(...skipping 2549 matching lines...) Expand 10 before | Expand all | Expand 10 after
2644 } 2643 }
2645 2644
2646 extensions::ActiveTabPermissionGranter* 2645 extensions::ActiveTabPermissionGranter*
2647 BrowserView::GetActiveTabPermissionGranter() { 2646 BrowserView::GetActiveTabPermissionGranter() {
2648 content::WebContents* web_contents = GetActiveWebContents(); 2647 content::WebContents* web_contents = GetActiveWebContents();
2649 if (!web_contents) 2648 if (!web_contents)
2650 return nullptr; 2649 return nullptr;
2651 return extensions::TabHelper::FromWebContents(web_contents) 2650 return extensions::TabHelper::FromWebContents(web_contents)
2652 ->active_tab_permission_granter(); 2651 ->active_tab_permission_granter();
2653 } 2652 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_impl.cc ('k') | chrome/browser/ui/views/session_crashed_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698