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

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

Issue 187443008: Elim Browser::AppType (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add non trusted type test Created 6 years, 8 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
OLDNEW
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
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(&params); 44 chrome::Navigate(&params);
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(&params); 55 chrome::Navigate(&params);
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
OLDNEW
« no previous file with comments | « chrome/browser/ui/extensions/application_launch.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698