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

Side by Side Diff: chrome/browser/ui/webui/sync_setup_handler_unittest.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 (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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 return NULL; 192 return NULL;
193 } 193 }
194 virtual void SetController(content::WebUIController* controller) OVERRIDE {} 194 virtual void SetController(content::WebUIController* controller) OVERRIDE {}
195 virtual float GetDeviceScaleFactor() const OVERRIDE { 195 virtual float GetDeviceScaleFactor() const OVERRIDE {
196 return 1.0f; 196 return 1.0f;
197 } 197 }
198 virtual const base::string16& GetOverriddenTitle() const OVERRIDE { 198 virtual const base::string16& GetOverriddenTitle() const OVERRIDE {
199 return temp_string_; 199 return temp_string_;
200 } 200 }
201 virtual void OverrideTitle(const base::string16& title) OVERRIDE {} 201 virtual void OverrideTitle(const base::string16& title) OVERRIDE {}
202 virtual content::PageTransition GetLinkTransitionType() const OVERRIDE { 202 virtual ui::PageTransition GetLinkTransitionType() const OVERRIDE {
203 return content::PAGE_TRANSITION_LINK; 203 return ui::PAGE_TRANSITION_LINK;
204 } 204 }
205 virtual void SetLinkTransitionType(content::PageTransition type) OVERRIDE {} 205 virtual void SetLinkTransitionType(ui::PageTransition type) OVERRIDE {}
206 virtual int GetBindings() const OVERRIDE { 206 virtual int GetBindings() const OVERRIDE {
207 return 0; 207 return 0;
208 } 208 }
209 virtual void SetBindings(int bindings) OVERRIDE {} 209 virtual void SetBindings(int bindings) OVERRIDE {}
210 virtual void OverrideJavaScriptFrame( 210 virtual void OverrideJavaScriptFrame(
211 const std::string& frame_name) OVERRIDE {} 211 const std::string& frame_name) OVERRIDE {}
212 virtual void AddMessageHandler( 212 virtual void AddMessageHandler(
213 content::WebUIMessageHandler* handler) OVERRIDE {} 213 content::WebUIMessageHandler* handler) OVERRIDE {}
214 virtual void RegisterMessageCallback( 214 virtual void RegisterMessageCallback(
215 const std::string& message, 215 const std::string& message,
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 1051
1052 // This should display the sync setup dialog (not login). 1052 // This should display the sync setup dialog (not login).
1053 handler_->OpenSyncSetup(); 1053 handler_->OpenSyncSetup();
1054 1054
1055 ExpectConfig(); 1055 ExpectConfig();
1056 const TestWebUI::CallData& data = web_ui_.call_data()[0]; 1056 const TestWebUI::CallData& data = web_ui_.call_data()[0];
1057 base::DictionaryValue* dictionary; 1057 base::DictionaryValue* dictionary;
1058 ASSERT_TRUE(data.arg2->GetAsDictionary(&dictionary)); 1058 ASSERT_TRUE(data.arg2->GetAsDictionary(&dictionary));
1059 CheckBool(dictionary, "encryptAllData", true); 1059 CheckBool(dictionary, "encryptAllData", true);
1060 } 1060 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698