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

Side by Side Diff: chrome/common/chrome_content_client_ios.mm

Issue 15702003: Move webkit/user_agent/ into webkit/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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/common/chrome_content_client.cc ('k') | chrome_frame/html_utils.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "chrome/common/chrome_version_info.h" 9 #include "chrome/common/chrome_version_info.h"
10 #include "chrome/common/url_constants.h" 10 #include "chrome/common/url_constants.h"
11 #include "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
14 #include "webkit/user_agent/user_agent_util.h" 14 #include "webkit/common/user_agent/user_agent_util.h"
15 15
16 // TODO(ios): Investigate merging with chrome_content_client.cc; this would 16 // TODO(ios): Investigate merging with chrome_content_client.cc; this would
17 // requiring either a lot of ifdefing, or spliting the file into parts. 17 // requiring either a lot of ifdefing, or spliting the file into parts.
18 18
19 namespace chrome { 19 namespace chrome {
20 20
21 void ChromeContentClient::SetActiveURL(const GURL& url) { 21 void ChromeContentClient::SetActiveURL(const GURL& url) {
22 NOTIMPLEMENTED(); 22 NOTIMPLEMENTED();
23 } 23 }
24 24
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const { 79 gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const {
80 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); 80 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
81 } 81 }
82 82
83 std::string ChromeContentClient::GetProcessTypeNameInEnglish(int type) { 83 std::string ChromeContentClient::GetProcessTypeNameInEnglish(int type) {
84 DCHECK(false) << "Unknown child process type!"; 84 DCHECK(false) << "Unknown child process type!";
85 return "Unknown"; 85 return "Unknown";
86 } 86 }
87 87
88 } // namespace chrome 88 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome_frame/html_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698