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

Side by Side Diff: chrome/browser/extensions/api/tabs/ash_panel_contents.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/api/tabs/ash_panel_contents.h" 5 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" 9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
10 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" 10 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 content::WebContentsObserver::Observe(web_contents_.get()); 191 content::WebContentsObserver::Observe(web_contents_.get());
192 } 192 }
193 193
194 void AshPanelContents::LoadContents(int32 creator_process_id) { 194 void AshPanelContents::LoadContents(int32 creator_process_id) {
195 // This must be created after the native window has been created. 195 // This must be created after the native window has been created.
196 window_controller_.reset(new AshPanelWindowController( 196 window_controller_.reset(new AshPanelWindowController(
197 host_, Profile::FromBrowserContext(host_->browser_context()))); 197 host_, Profile::FromBrowserContext(host_->browser_context())));
198 198
199 web_contents_->GetController().LoadURL( 199 web_contents_->GetController().LoadURL(
200 url_, content::Referrer(), content::PAGE_TRANSITION_LINK, 200 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK,
201 std::string()); 201 std::string());
202 } 202 }
203 203
204 void AshPanelContents::NativeWindowChanged(NativeAppWindow* native_app_window) { 204 void AshPanelContents::NativeWindowChanged(NativeAppWindow* native_app_window) {
205 if (window_controller_) 205 if (window_controller_)
206 window_controller_->NativeWindowChanged(); 206 window_controller_->NativeWindowChanged();
207 } 207 }
208 208
209 void AshPanelContents::NativeWindowClosed() { 209 void AshPanelContents::NativeWindowClosed() {
210 } 210 }
(...skipping 27 matching lines...) Expand all
238 238
239 content::WebContents* AshPanelContents::GetAssociatedWebContents() const { 239 content::WebContents* AshPanelContents::GetAssociatedWebContents() const {
240 return web_contents_.get(); 240 return web_contents_.get();
241 } 241 }
242 242
243 void AshPanelContents::OnRequest( 243 void AshPanelContents::OnRequest(
244 const ExtensionHostMsg_Request_Params& params) { 244 const ExtensionHostMsg_Request_Params& params) {
245 extension_function_dispatcher_->Dispatch( 245 extension_function_dispatcher_->Dispatch(
246 params, web_contents_->GetRenderViewHost()); 246 params, web_contents_->GetRenderViewHost());
247 } 247 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698