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

Side by Side Diff: chrome/browser/ui/webui/sync_setup_handler_unittest.cc

Issue 14080004: Remove some chrome-specific methods from content::WebUI. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix browser_test Created 7 years, 8 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
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.cc ('k') | chrome/browser/ui/webui/web_ui_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ui/webui/sync_setup_handler.h" 5 #include "chrome/browser/ui/webui/sync_setup_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 virtual content::WebContents* GetWebContents() const OVERRIDE { 238 virtual content::WebContents* GetWebContents() const OVERRIDE {
239 return NULL; 239 return NULL;
240 } 240 }
241 virtual content::WebUIController* GetController() const OVERRIDE { 241 virtual content::WebUIController* GetController() const OVERRIDE {
242 return NULL; 242 return NULL;
243 } 243 }
244 virtual void SetController(content::WebUIController* controller) OVERRIDE {} 244 virtual void SetController(content::WebUIController* controller) OVERRIDE {}
245 virtual ui::ScaleFactor GetDeviceScaleFactor() const OVERRIDE { 245 virtual ui::ScaleFactor GetDeviceScaleFactor() const OVERRIDE {
246 return ui::SCALE_FACTOR_100P; 246 return ui::SCALE_FACTOR_100P;
247 } 247 }
248 virtual bool ShouldHideFavicon() const OVERRIDE {
249 return false;
250 }
251 virtual void HideFavicon() OVERRIDE {}
252 virtual bool ShouldFocusLocationBarByDefault() const OVERRIDE {
253 return false;
254 }
255 virtual void FocusLocationBarByDefault() OVERRIDE {}
256 virtual bool ShouldHideURL() const OVERRIDE {
257 return false;
258 }
259 virtual void HideURL() OVERRIDE {}
260 virtual const string16& GetOverriddenTitle() const OVERRIDE { 248 virtual const string16& GetOverriddenTitle() const OVERRIDE {
261 return temp_string_; 249 return temp_string_;
262 } 250 }
263 virtual void OverrideTitle(const string16& title) OVERRIDE {} 251 virtual void OverrideTitle(const string16& title) OVERRIDE {}
264 virtual content::PageTransition GetLinkTransitionType() const OVERRIDE { 252 virtual content::PageTransition GetLinkTransitionType() const OVERRIDE {
265 return content::PAGE_TRANSITION_LINK; 253 return content::PAGE_TRANSITION_LINK;
266 } 254 }
267 virtual void SetLinkTransitionType(content::PageTransition type) OVERRIDE {} 255 virtual void SetLinkTransitionType(content::PageTransition type) OVERRIDE {}
268 virtual int GetBindings() const OVERRIDE { 256 virtual int GetBindings() const OVERRIDE {
269 return 0; 257 return 0;
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 std::string()); 1296 std::string());
1309 handler_->CloseSyncSetup(); 1297 handler_->CloseSyncSetup();
1310 EXPECT_EQ(NULL, 1298 EXPECT_EQ(NULL,
1311 LoginUIServiceFactory::GetForProfile( 1299 LoginUIServiceFactory::GetForProfile(
1312 profile_.get())->current_login_ui()); 1300 profile_.get())->current_login_ui());
1313 } 1301 }
1314 1302
1315 INSTANTIATE_TEST_CASE_P(SyncSetupHandlerTestWithParam, 1303 INSTANTIATE_TEST_CASE_P(SyncSetupHandlerTestWithParam,
1316 SyncSetupHandlerTest, 1304 SyncSetupHandlerTest,
1317 Values(true, false)); 1305 Values(true, false));
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.cc ('k') | chrome/browser/ui/webui/web_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698