chrome/browser/ui/browser_navigator.cc - Issue 8493017: Cleanup extension permissions module.

Side by Side Diff: chrome/browser/ui/browser_navigator.cc

Issue 8493017: Cleanup extension permissions module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 11 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/tab_contents/render_view_host_delegate_helper.cc ('k') | chrome/browser/ui/intents/web_intent_picker_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 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/browser_navigator.h"	5 #include "chrome/browser/ui/browser_navigator.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/stringprintf.h"	10 #include "base/stringprintf.h"

11 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

12 #include "chrome/browser/browser_about_handler.h"	12 #include "chrome/browser/browser_about_handler.h"

13 #include "chrome/browser/extensions/extension_service.h"	13 #include "chrome/browser/extensions/extension_service.h"

14 #include "chrome/browser/extensions/extension_tab_helper.h"	14 #include "chrome/browser/extensions/extension_tab_helper.h"

15 #include "chrome/browser/google/google_url_tracker.h"	15 #include "chrome/browser/google/google_url_tracker.h"

16 #include "chrome/browser/prefs/incognito_mode_prefs.h"	16 #include "chrome/browser/prefs/incognito_mode_prefs.h"

17 #include "chrome/browser/prefs/pref_service.h"	17 #include "chrome/browser/prefs/pref_service.h"

18 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/rlz/rlz.h"	19 #include "chrome/browser/rlz/rlz.h"

20 #include "chrome/browser/tab_contents/tab_util.h"	20 #include "chrome/browser/tab_contents/tab_util.h"

21 #include "chrome/browser/tabs/tab_strip_model.h"	21 #include "chrome/browser/tabs/tab_strip_model.h"

22 #include "chrome/browser/ui/browser.h"	22 #include "chrome/browser/ui/browser.h"

23 #include "chrome/browser/ui/browser_list.h"	23 #include "chrome/browser/ui/browser_list.h"

24 #include "chrome/browser/ui/browser_window.h"	24 #include "chrome/browser/ui/browser_window.h"

25 #include "chrome/browser/ui/omnibox/location_bar.h"	25 #include "chrome/browser/ui/omnibox/location_bar.h"

26 #include "chrome/browser/ui/status_bubble.h"	26 #include "chrome/browser/ui/status_bubble.h"

27 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	27 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

28 #include "chrome/browser/web_applications/web_app.h"	28 #include "chrome/browser/web_applications/web_app.h"

	29 #include "chrome/common/chrome_notification_types.h"

29 #include "chrome/common/extensions/extension.h"	30 #include "chrome/common/extensions/extension.h"

30 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

31 #include "chrome/common/url_constants.h"	32 #include "chrome/common/url_constants.h"

32 #include "content/browser/browser_url_handler.h"	33 #include "content/browser/browser_url_handler.h"

33 #include "content/browser/renderer_host/render_view_host.h"	34 #include "content/browser/renderer_host/render_view_host.h"

34 #include "content/browser/renderer_host/render_view_host_delegate.h"	35 #include "content/browser/renderer_host/render_view_host_delegate.h"

35 #include "content/browser/site_instance.h"	36 #include "content/browser/site_instance.h"

36 #include "content/public/browser/notification_service.h"	37 #include "content/public/browser/notification_service.h"

37 #include "content/public/browser/web_contents.h"	38 #include "content/public/browser/web_contents.h"

38 #include "net/http/http_util.h"	39 #include "net/http/http_util.h"

(...skipping 629 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
668 popup_bounds.height() > max_height \|\|	669 popup_bounds.height() > max_height \|\|

669 popup_bounds.width() == 0 \|\|	670 popup_bounds.width() == 0 \|\|

670 popup_bounds.height() == 0) {	671 popup_bounds.height() == 0) {

671 return NEW_FOREGROUND_TAB;	672 return NEW_FOREGROUND_TAB;

672 }	673 }

673 return NEW_POPUP;	674 return NEW_POPUP;

674 }	675 }

675 #endif	676 #endif

676	677

677 } // namespace browser	678 } // namespace browser

OLD	NEW