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

Side by Side Diff: chrome/browser/ui/app_list/start_page_service.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/ui/app_list/start_page_service.h" 5 #include "chrome/browser/ui/app_list/start_page_service.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 GURL url(chrome::kChromeUIAppListStartPageURL); 237 GURL url(chrome::kChromeUIAppListStartPageURL);
238 CommandLine* command_line = CommandLine::ForCurrentProcess(); 238 CommandLine* command_line = CommandLine::ForCurrentProcess();
239 if (command_line->HasSwitch(::switches::kAppListStartPageURL)) { 239 if (command_line->HasSwitch(::switches::kAppListStartPageURL)) {
240 url = GURL( 240 url = GURL(
241 command_line->GetSwitchValueASCII(::switches::kAppListStartPageURL)); 241 command_line->GetSwitchValueASCII(::switches::kAppListStartPageURL));
242 } 242 }
243 243
244 contents_->GetController().LoadURL( 244 contents_->GetController().LoadURL(
245 url, 245 url,
246 content::Referrer(), 246 content::Referrer(),
247 content::PAGE_TRANSITION_AUTO_TOPLEVEL, 247 ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
248 std::string()); 248 std::string());
249 } 249 }
250 250
251 void StartPageService::UnloadContents() { 251 void StartPageService::UnloadContents() {
252 contents_.reset(); 252 contents_.reset();
253 } 253 }
254 254
255 } // namespace app_list 255 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698