OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/browser_about_handler.h" | 10 #include "chrome/browser/browser_about_handler.h" |
11 #include "chrome/browser/browser_url_handler.h" | 11 #include "chrome/browser/browser_url_handler.h" |
| 12 #include "chrome/browser/event_disposition.h" |
12 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
13 #include "chrome/browser/extensions/extension_tab_helper.h" | 14 #include "chrome/browser/extensions/extension_tab_helper.h" |
14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/tabs/tab_strip_model.h" | 16 #include "chrome/browser/tabs/tab_strip_model.h" |
16 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_list.h" | 18 #include "chrome/browser/ui/browser_list.h" |
18 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.h" |
19 #include "chrome/browser/ui/omnibox/location_bar.h" | 20 #include "chrome/browser/ui/omnibox/location_bar.h" |
20 #include "chrome/browser/ui/status_bubble.h" | 21 #include "chrome/browser/ui/status_bubble.h" |
21 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 22 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
528 params->url, params->referrer, params->transition); | 529 params->url, params->referrer, params->transition); |
529 } | 530 } |
530 | 531 |
531 // If the singleton tab isn't already selected, select it. | 532 // If the singleton tab isn't already selected, select it. |
532 if (params->source_contents != params->target_contents) | 533 if (params->source_contents != params->target_contents) |
533 params->browser->ActivateTabAt(singleton_index, user_initiated); | 534 params->browser->ActivateTabAt(singleton_index, user_initiated); |
534 } | 535 } |
535 } | 536 } |
536 | 537 |
537 } // namespace browser | 538 } // namespace browser |
OLD | NEW |