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: content/shell/shell_browser_main_parts.cc

Issue 12208057: Add explicit base to FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | « content/shell/shell_browser_main.cc ('k') | content/shell/shell_content_browser_client.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 "content/shell/shell_browser_main_parts.h" 5 #include "content/shell/shell_browser_main_parts.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 return GURL(); 48 return GURL();
49 #endif 49 #endif
50 50
51 if (args.empty()) 51 if (args.empty())
52 return GURL("http://www.google.com/"); 52 return GURL("http://www.google.com/");
53 53
54 GURL url(args[0]); 54 GURL url(args[0]);
55 if (url.is_valid() && url.has_scheme()) 55 if (url.is_valid() && url.has_scheme())
56 return url; 56 return url;
57 57
58 return net::FilePathToFileURL(FilePath(args[0])); 58 return net::FilePathToFileURL(base::FilePath(args[0]));
59 } 59 }
60 60
61 base::StringPiece PlatformResourceProvider(int key) { 61 base::StringPiece PlatformResourceProvider(int key) {
62 if (key == IDR_DIR_HEADER_HTML) { 62 if (key == IDR_DIR_HEADER_HTML) {
63 base::StringPiece html_data = 63 base::StringPiece html_data =
64 ui::ResourceBundle::GetSharedInstance().GetRawDataResource( 64 ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
65 IDR_DIR_HEADER_HTML); 65 IDR_DIR_HEADER_HTML);
66 return html_data; 66 return html_data;
67 } 67 }
68 return base::StringPiece(); 68 return base::StringPiece();
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #if defined(USE_AURA) 152 #if defined(USE_AURA)
153 Shell::PlatformExit(); 153 Shell::PlatformExit();
154 #endif 154 #endif
155 if (devtools_delegate_) 155 if (devtools_delegate_)
156 devtools_delegate_->Stop(); 156 devtools_delegate_->Stop();
157 browser_context_.reset(); 157 browser_context_.reset();
158 off_the_record_browser_context_.reset(); 158 off_the_record_browser_context_.reset();
159 } 159 }
160 160
161 } // namespace 161 } // namespace
OLDNEW
« no previous file with comments | « content/shell/shell_browser_main.cc ('k') | content/shell/shell_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698