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

Side by Side Diff: chrome_frame/chrome_frame_plugin.h

Issue 14030003: Remove Chrome Frame's delay shutdown field trial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dear Greg Created 7 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
« no previous file with comments | « chrome_frame/chrome_frame_automation.cc ('k') | chrome_frame/chrome_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ 5 #ifndef CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
6 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ 6 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // running in browser chrome or some other privileged context. 75 // running in browser chrome or some other privileged context.
76 bool incognito_mode = !is_privileged() && incognito; 76 bool incognito_mode = !is_privileged() && incognito;
77 base::FilePath profile_path; 77 base::FilePath profile_path;
78 GetProfilePath(profile_name, &profile_path); 78 GetProfilePath(profile_name, &profile_path);
79 // The profile name could change based on the browser version. For e.g. for 79 // The profile name could change based on the browser version. For e.g. for
80 // IE6/7 the profile is created in a different folder whose last component 80 // IE6/7 the profile is created in a different folder whose last component
81 // is Google Chrome Frame. 81 // is Google Chrome Frame.
82 base::FilePath actual_profile_name = profile_path.BaseName(); 82 base::FilePath actual_profile_name = profile_path.BaseName();
83 launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path, 83 launch_params_ = new ChromeFrameLaunchParams(url, referrer, profile_path,
84 actual_profile_name.value(), SimpleResourceLoader::GetLanguage(), 84 actual_profile_name.value(), SimpleResourceLoader::GetLanguage(),
85 incognito_mode, is_widget_mode, route_all_top_level_navigations, 85 incognito_mode, is_widget_mode, route_all_top_level_navigations);
86 automation_client_->send_shutdown_delay_switch());
87 return automation_client_->Initialize(this, launch_params_); 86 return automation_client_->Initialize(this, launch_params_);
88 } 87 }
89 88
90 // ChromeFrameDelegate implementation 89 // ChromeFrameDelegate implementation
91 virtual WindowType GetWindow() const { 90 virtual WindowType GetWindow() const {
92 return (static_cast<const T*>(this))->m_hWnd; 91 return (static_cast<const T*>(this))->m_hWnd;
93 } 92 }
94 93
95 virtual void GetBounds(RECT* bounds) { 94 virtual void GetBounds(RECT* bounds) {
96 if (bounds) { 95 if (bounds) {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 // Url of the containing document. 252 // Url of the containing document.
254 std::string document_url_; 253 std::string document_url_;
255 254
256 // We set this flag when we're taking the focus ourselves 255 // We set this flag when we're taking the focus ourselves
257 // and notifying the host browser that we're doing so. 256 // and notifying the host browser that we're doing so.
258 // When the flag is not set, we transfer the focus to chrome. 257 // When the flag is not set, we transfer the focus to chrome.
259 bool ignore_setfocus_; 258 bool ignore_setfocus_;
260 }; 259 };
261 260
262 #endif // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_ 261 #endif // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_automation.cc ('k') | chrome_frame/chrome_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698