OLD | NEW |
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 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/settings_window_manager.h" | 5 #include "chrome/browser/ui/settings_window_manager.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/browser_finder.h" | 8 #include "chrome/browser/ui/browser_finder.h" |
9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 content::PAGE_TRANSITION_AUTO_BOOKMARK); | 41 content::PAGE_TRANSITION_AUTO_BOOKMARK); |
42 params.window_action = NavigateParams::SHOW_WINDOW; | 42 params.window_action = NavigateParams::SHOW_WINDOW; |
43 params.user_gesture = true; | 43 params.user_gesture = true; |
44 chrome::Navigate(¶ms); | 44 chrome::Navigate(¶ms); |
45 return; | 45 return; |
46 } | 46 } |
47 } | 47 } |
48 // No existing browser window, create one. | 48 // No existing browser window, create one. |
49 NavigateParams params(profile, gurl, content::PAGE_TRANSITION_AUTO_BOOKMARK); | 49 NavigateParams params(profile, gurl, content::PAGE_TRANSITION_AUTO_BOOKMARK); |
50 params.disposition = NEW_POPUP; | 50 params.disposition = NEW_POPUP; |
| 51 params.is_trusted = true; |
51 params.window_action = NavigateParams::SHOW_WINDOW; | 52 params.window_action = NavigateParams::SHOW_WINDOW; |
52 params.user_gesture = true; | 53 params.user_gesture = true; |
53 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; | 54 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; |
54 chrome::Navigate(¶ms); | 55 chrome::Navigate(¶ms); |
55 settings_session_map_[profile] = params.browser->session_id().id(); | 56 settings_session_map_[profile] = params.browser->session_id().id(); |
56 } | 57 } |
57 | 58 |
58 SettingsWindowManager::SettingsWindowManager() { | 59 SettingsWindowManager::SettingsWindowManager() { |
59 } | 60 } |
60 | 61 |
61 SettingsWindowManager::~SettingsWindowManager() { | 62 SettingsWindowManager::~SettingsWindowManager() { |
62 } | 63 } |
63 | 64 |
64 } // namespace chrome | 65 } // namespace chrome |
OLD | NEW |