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

Side by Side Diff: content/shell/shell_content_browser_client.cc

Issue 9982011: Mac content shell: Fix new browser window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | « content/shell/shell_browser_main_parts.cc ('k') | no next file » | 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_content_browser_client.h" 5 #include "content/shell/shell_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "content/shell/shell.h" 9 #include "content/shell/shell.h"
10 #include "content/shell/shell_browser_context.h"
11 #include "content/shell/shell_browser_main_parts.h" 10 #include "content/shell/shell_browser_main_parts.h"
12 #include "content/shell/shell_devtools_delegate.h" 11 #include "content/shell/shell_devtools_delegate.h"
13 #include "content/shell/shell_render_view_host_observer.h" 12 #include "content/shell/shell_render_view_host_observer.h"
14 #include "content/shell/shell_switches.h" 13 #include "content/shell/shell_switches.h"
15 #include "googleurl/src/gurl.h" 14 #include "googleurl/src/gurl.h"
16 #include "third_party/skia/include/core/SkBitmap.h" 15 #include "third_party/skia/include/core/SkBitmap.h"
17 16
18 namespace content { 17 namespace content {
19 18
20 ShellContentBrowserClient::ShellContentBrowserClient() 19 ShellContentBrowserClient::ShellContentBrowserClient()
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 #endif 341 #endif
343 342
344 #if defined(USE_NSS) 343 #if defined(USE_NSS)
345 crypto::CryptoModuleBlockingPasswordDelegate* 344 crypto::CryptoModuleBlockingPasswordDelegate*
346 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) { 345 ShellContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
347 return NULL; 346 return NULL;
348 } 347 }
349 #endif 348 #endif
350 349
351 ShellBrowserContext* ShellContentBrowserClient::browser_context() { 350 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
352 return ShellBrowserContext::GetInstance(); 351 return shell_browser_main_parts_->browser_context();
353 } 352 }
354 353
355 } // namespace content 354 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_browser_main_parts.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698