OLD | NEW |
1 // Copyright (c) 2012 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" |
(...skipping 14 matching lines...) Expand all Loading... |
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/chrome_notification_types.h" |
30 #include "chrome/common/extensions/extension.h" | 30 #include "chrome/common/extensions/extension.h" |
31 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
32 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
33 #include "content/browser/browser_url_handler.h" | 33 #include "content/browser/browser_url_handler.h" |
34 #include "content/browser/renderer_host/render_view_host.h" | 34 #include "content/browser/renderer_host/render_view_host.h" |
35 #include "content/browser/site_instance.h" | |
36 #include "content/public/browser/notification_service.h" | 35 #include "content/public/browser/notification_service.h" |
37 #include "content/public/browser/render_view_host_delegate.h" | 36 #include "content/public/browser/render_view_host_delegate.h" |
38 #include "content/public/browser/web_contents.h" | 37 #include "content/public/browser/web_contents.h" |
39 #include "net/http/http_util.h" | 38 #include "net/http/http_util.h" |
40 | 39 |
41 using content::GlobalRequestID; | 40 using content::GlobalRequestID; |
42 using content::WebContents; | 41 using content::WebContents; |
43 | 42 |
44 namespace { | 43 namespace { |
45 | 44 |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 popup_bounds.height() > max_height || | 668 popup_bounds.height() > max_height || |
670 popup_bounds.width() == 0 || | 669 popup_bounds.width() == 0 || |
671 popup_bounds.height() == 0) { | 670 popup_bounds.height() == 0) { |
672 return NEW_FOREGROUND_TAB; | 671 return NEW_FOREGROUND_TAB; |
673 } | 672 } |
674 return NEW_POPUP; | 673 return NEW_POPUP; |
675 } | 674 } |
676 #endif | 675 #endif |
677 | 676 |
678 } // namespace browser | 677 } // namespace browser |
OLD | NEW |