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

Side by Side Diff: chrome/browser/devtools/browser_list_tabcontents_provider.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
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/browser/devtools/browser_list_tabcontents_provider.h" 5 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "chrome/browser/devtools/devtools_target_impl.h" 9 #include "chrome/browser/devtools/devtools_target_impl.h"
10 #include "chrome/browser/history/top_sites.h" 10 #include "chrome/browser/history/top_sites.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (top_sites->GetPageThumbnail(url, false, &data)) 96 if (top_sites->GetPageThumbnail(url, false, &data))
97 return std::string(data->front_as<char>(), data->size()); 97 return std::string(data->front_as<char>(), data->size());
98 } 98 }
99 99
100 return std::string(); 100 return std::string();
101 } 101 }
102 102
103 scoped_ptr<DevToolsTarget> 103 scoped_ptr<DevToolsTarget>
104 BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) { 104 BrowserListTabContentsProvider::CreateNewTarget(const GURL& url) {
105 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(), 105 chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
106 url, content::PAGE_TRANSITION_AUTO_TOPLEVEL); 106 url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
107 params.disposition = NEW_FOREGROUND_TAB; 107 params.disposition = NEW_FOREGROUND_TAB;
108 chrome::Navigate(&params); 108 chrome::Navigate(&params);
109 if (!params.target_contents) 109 if (!params.target_contents)
110 return scoped_ptr<DevToolsTarget>(); 110 return scoped_ptr<DevToolsTarget>();
111 return scoped_ptr<DevToolsTarget>( 111 return scoped_ptr<DevToolsTarget>(
112 DevToolsTargetImpl::CreateForWebContents(params.target_contents, true)); 112 DevToolsTargetImpl::CreateForWebContents(params.target_contents, true));
113 } 113 }
114 114
115 void BrowserListTabContentsProvider::EnumerateTargets(TargetCallback callback) { 115 void BrowserListTabContentsProvider::EnumerateTargets(TargetCallback callback) {
116 DevToolsTargetImpl::EnumerateAllTargets( 116 DevToolsTargetImpl::EnumerateAllTargets(
117 *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback)); 117 *reinterpret_cast<DevToolsTargetImpl::Callback*>(&callback));
118 } 118 }
119 119
120 scoped_ptr<net::StreamListenSocket> 120 scoped_ptr<net::StreamListenSocket>
121 BrowserListTabContentsProvider::CreateSocketForTethering( 121 BrowserListTabContentsProvider::CreateSocketForTethering(
122 net::StreamListenSocket::Delegate* delegate, 122 net::StreamListenSocket::Delegate* delegate,
123 std::string* name) { 123 std::string* name) {
124 if (!g_tethering_enabled.Get()) 124 if (!g_tethering_enabled.Get())
125 return scoped_ptr<net::StreamListenSocket>(); 125 return scoped_ptr<net::StreamListenSocket>();
126 126
127 if (last_tethering_port_ == kMaxTetheringPort) 127 if (last_tethering_port_ == kMaxTetheringPort)
128 last_tethering_port_ = kMinTetheringPort; 128 last_tethering_port_ = kMinTetheringPort;
129 int port = ++last_tethering_port_; 129 int port = ++last_tethering_port_;
130 *name = base::IntToString(port); 130 *name = base::IntToString(port);
131 return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate) 131 return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate)
132 .PassAs<net::StreamListenSocket>(); 132 .PassAs<net::StreamListenSocket>();
133 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698