| OLD | NEW | 
|    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 <stddef.h> |    7 #include <stddef.h> | 
|    8  |    8  | 
|    9 #include <string> |    9 #include <string> | 
|   10  |   10  | 
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  206  |  206  | 
|  207     new_tab_params.initiating_profile = profile_; |  207     new_tab_params.initiating_profile = profile_; | 
|  208     chrome::Navigate(&new_tab_params); |  208     chrome::Navigate(&new_tab_params); | 
|  209  |  209  | 
|  210     return new_tab_params.target_contents; |  210     return new_tab_params.target_contents; | 
|  211   } |  211   } | 
|  212  |  212  | 
|  213   bool PreHandleGestureEvent(content::WebContents* /*source*/, |  213   bool PreHandleGestureEvent(content::WebContents* /*source*/, | 
|  214                              const blink::WebGestureEvent& event) override { |  214                              const blink::WebGestureEvent& event) override { | 
|  215     // Disable pinch zooming on the start page web contents. |  215     // Disable pinch zooming on the start page web contents. | 
|  216     return event.type == blink::WebGestureEvent::GesturePinchBegin || |  216     return event.type() == blink::WebGestureEvent::GesturePinchBegin || | 
|  217            event.type == blink::WebGestureEvent::GesturePinchUpdate || |  217            event.type() == blink::WebGestureEvent::GesturePinchUpdate || | 
|  218            event.type == blink::WebGestureEvent::GesturePinchEnd; |  218            event.type() == blink::WebGestureEvent::GesturePinchEnd; | 
|  219   } |  219   } | 
|  220  |  220  | 
|  221  |  221  | 
|  222  private: |  222  private: | 
|  223   Profile* profile_; |  223   Profile* profile_; | 
|  224  |  224  | 
|  225   DISALLOW_COPY_AND_ASSIGN(StartPageWebContentsDelegate); |  225   DISALLOW_COPY_AND_ASSIGN(StartPageWebContentsDelegate); | 
|  226 }; |  226 }; | 
|  227  |  227  | 
|  228 #if defined(OS_CHROMEOS) |  228 #if defined(OS_CHROMEOS) | 
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  684  |  684  | 
|  685   // Check for a new doodle. |  685   // Check for a new doodle. | 
|  686   content::BrowserThread::PostDelayedTask( |  686   content::BrowserThread::PostDelayedTask( | 
|  687       content::BrowserThread::UI, FROM_HERE, |  687       content::BrowserThread::UI, FROM_HERE, | 
|  688       base::Bind(&StartPageService::FetchDoodleJson, |  688       base::Bind(&StartPageService::FetchDoodleJson, | 
|  689                  weak_factory_.GetWeakPtr()), |  689                  weak_factory_.GetWeakPtr()), | 
|  690       recheck_delay); |  690       recheck_delay); | 
|  691 } |  691 } | 
|  692  |  692  | 
|  693 }  // namespace app_list |  693 }  // namespace app_list | 
| OLD | NEW |