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

Side by Side Diff: chrome/browser/chromeos/login/web_page_screen.cc

Issue 9382037: Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chromeos/login/web_page_screen.h" 5 #include "chrome/browser/chromeos/login/web_page_screen.h"
6 6
7 #include "base/time.h" 7 #include "base/time.h"
8 8
9 using base::TimeDelta; 9 using base::TimeDelta;
10 10
(...skipping 12 matching lines...) Expand all
23 23
24 /////////////////////////////////////////////////////////////////////////////// 24 ///////////////////////////////////////////////////////////////////////////////
25 // WebPageScreen, content::WebContentsDelegate implementation: 25 // WebPageScreen, content::WebContentsDelegate implementation:
26 26
27 bool WebPageScreen::ShouldAddNavigationToHistory( 27 bool WebPageScreen::ShouldAddNavigationToHistory(
28 const history::HistoryAddPageArgs& add_page_args, 28 const history::HistoryAddPageArgs& add_page_args,
29 content::NavigationType navigation_type) { 29 content::NavigationType navigation_type) {
30 return false; 30 return false;
31 } 31 }
32 32
33 bool WebPageScreen::HandleContextMenu(const ContextMenuParams& params) { 33 bool WebPageScreen::HandleContextMenu(
34 const content::ContextMenuParams& params) {
34 // Just return true because we don't want to show context menue. 35 // Just return true because we don't want to show context menue.
35 return true; 36 return true;
36 } 37 }
37 38
38 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
39 // WebPageScreen, protected: 40 // WebPageScreen, protected:
40 41
41 void WebPageScreen::OnNetworkTimeout() { 42 void WebPageScreen::OnNetworkTimeout() {
42 // TODO(nkostylev): Add better detection for limited connectivity. 43 // TODO(nkostylev): Add better detection for limited connectivity.
43 // http://crosbug.com/3690 44 // http://crosbug.com/3690
44 CloseScreen(ScreenObserver::CONNECTION_FAILED); 45 CloseScreen(ScreenObserver::CONNECTION_FAILED);
45 } 46 }
46 47
47 void WebPageScreen::StartTimeoutTimer() { 48 void WebPageScreen::StartTimeoutTimer() {
48 StopTimeoutTimer(); 49 StopTimeoutTimer();
49 timeout_timer_.Start(FROM_HERE, 50 timeout_timer_.Start(FROM_HERE,
50 TimeDelta::FromSeconds(kNetworkTimeoutSec), 51 TimeDelta::FromSeconds(kNetworkTimeoutSec),
51 this, 52 this,
52 &WebPageScreen::OnNetworkTimeout); 53 &WebPageScreen::OnNetworkTimeout);
53 } 54 }
54 55
55 void WebPageScreen::StopTimeoutTimer() { 56 void WebPageScreen::StopTimeoutTimer() {
56 if (timeout_timer_.IsRunning()) 57 if (timeout_timer_.IsRunning())
57 timeout_timer_.Stop(); 58 timeout_timer_.Stop();
58 } 59 }
59 60
60 } // namespace chromeos 61 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698