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

Side by Side Diff: chrome_frame/utils.cc

Issue 18919005: Migrate from googleurl/ includes to url/ ones in the remaining top-level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make googleurl a temp include rule - to prevent others including it again Created 7 years, 5 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/utils.h ('k') | chromeos/ime/input_method_descriptor.h » ('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 #include "chrome_frame/utils.h" 5 #include "chrome_frame/utils.h"
6 6
7 #include <atlsafe.h> 7 #include <atlsafe.h>
8 #include <atlsecurity.h> 8 #include <atlsecurity.h>
9 #include <htiframe.h> 9 #include <htiframe.h>
10 #include <mshtml.h> 10 #include <mshtml.h>
(...skipping 19 matching lines...) Expand all
30 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
31 #include "chrome/installer/util/chrome_frame_distribution.h" 31 #include "chrome/installer/util/chrome_frame_distribution.h"
32 #include "chrome_frame/chrome_tab.h" 32 #include "chrome_frame/chrome_tab.h"
33 #include "chrome_frame/extra_system_apis.h" 33 #include "chrome_frame/extra_system_apis.h"
34 #include "chrome_frame/html_utils.h" 34 #include "chrome_frame/html_utils.h"
35 #include "chrome_frame/navigation_constraints.h" 35 #include "chrome_frame/navigation_constraints.h"
36 #include "chrome_frame/policy_settings.h" 36 #include "chrome_frame/policy_settings.h"
37 #include "chrome_frame/registry_list_preferences_holder.h" 37 #include "chrome_frame/registry_list_preferences_holder.h"
38 #include "chrome_frame/simple_resource_loader.h" 38 #include "chrome_frame/simple_resource_loader.h"
39 #include "extensions/common/constants.h" 39 #include "extensions/common/constants.h"
40 #include "googleurl/src/gurl.h"
41 #include "googleurl/src/url_canon.h"
42 #include "grit/chromium_strings.h" 40 #include "grit/chromium_strings.h"
43 #include "net/base/escape.h" 41 #include "net/base/escape.h"
44 #include "net/http/http_util.h" 42 #include "net/http/http_util.h"
45 #include "ui/base/models/menu_model.h" 43 #include "ui/base/models/menu_model.h"
44 #include "url/gurl.h"
45 #include "url/url_canon.h"
46 46
47 using base::win::RegKey; 47 using base::win::RegKey;
48 48
49 // Note that these values are all lower case and are compared to 49 // Note that these values are all lower case and are compared to
50 // lower-case-transformed values. 50 // lower-case-transformed values.
51 const char kGCFProtocol[] = "gcf"; 51 const char kGCFProtocol[] = "gcf";
52 const wchar_t kBodyTag[] = L"body"; 52 const wchar_t kBodyTag[] = L"body";
53 const wchar_t kContentAttribName[] = L"content"; 53 const wchar_t kContentAttribName[] = L"content";
54 const wchar_t kChromeContentPrefix[] = L"chrome="; 54 const wchar_t kChromeContentPrefix[] = L"chrome=";
55 const wchar_t kChromeMimeType[] = L"application/chromepage"; 55 const wchar_t kChromeMimeType[] = L"application/chromepage";
(...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after
1674 wininet_connection_count_updated = true; 1674 wininet_connection_count_updated = true;
1675 return true; 1675 return true;
1676 } 1676 }
1677 1677
1678 void GetChromeFrameProfilePath(const string16& profile_name, 1678 void GetChromeFrameProfilePath(const string16& profile_name,
1679 base::FilePath* profile_path) { 1679 base::FilePath* profile_path) {
1680 chrome::GetChromeFrameUserDataDirectory(profile_path); 1680 chrome::GetChromeFrameUserDataDirectory(profile_path);
1681 *profile_path = profile_path->Append(profile_name); 1681 *profile_path = profile_path->Append(profile_name);
1682 DVLOG(1) << __FUNCTION__ << ": " << profile_path->value(); 1682 DVLOG(1) << __FUNCTION__ << ": " << profile_path->value();
1683 } 1683 }
OLDNEW
« no previous file with comments | « chrome_frame/utils.h ('k') | chromeos/ime/input_method_descriptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698