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

Side by Side Diff: chrome/test/base/test_location_bar.h

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/test/base/in_process_browser_test.cc ('k') | chrome/test/base/test_location_bar.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) 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 #ifndef CHROME_TEST_BASE_TEST_LOCATION_BAR_H_ 5 #ifndef CHROME_TEST_BASE_TEST_LOCATION_BAR_H_
6 #define CHROME_TEST_BASE_TEST_LOCATION_BAR_H_ 6 #define CHROME_TEST_BASE_TEST_LOCATION_BAR_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "chrome/browser/first_run/first_run.h" 10 #include "chrome/browser/first_run/first_run.h"
11 #include "chrome/browser/ui/omnibox/location_bar.h" 11 #include "chrome/browser/ui/omnibox/location_bar.h"
12 #include "content/common/page_transition_types.h" 12 #include "content/public/common/page_transition_types.h"
13 #include "webkit/glue/window_open_disposition.h" 13 #include "webkit/glue/window_open_disposition.h"
14 14
15 class TestLocationBar : public LocationBar { 15 class TestLocationBar : public LocationBar {
16 public: 16 public:
17 TestLocationBar(); 17 TestLocationBar();
18 virtual ~TestLocationBar(); 18 virtual ~TestLocationBar();
19 19
20 void set_input_string(const string16& input_string) { 20 void set_input_string(const string16& input_string) {
21 input_string_ = input_string; 21 input_string_ = input_string;
22 } 22 }
23 void set_disposition(WindowOpenDisposition disposition) { 23 void set_disposition(WindowOpenDisposition disposition) {
24 disposition_ = disposition; 24 disposition_ = disposition;
25 } 25 }
26 void set_transition(PageTransition::Type transition) { 26 void set_transition(content::PageTransition transition) {
27 transition_ = transition; 27 transition_ = transition;
28 } 28 }
29 29
30 // Overridden from LocationBar: 30 // Overridden from LocationBar:
31 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE {} 31 virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type) OVERRIDE {}
32 virtual void SetSuggestedText(const string16& text, 32 virtual void SetSuggestedText(const string16& text,
33 InstantCompleteBehavior behavior) OVERRIDE {} 33 InstantCompleteBehavior behavior) OVERRIDE {}
34 virtual string16 GetInputString() const OVERRIDE; 34 virtual string16 GetInputString() const OVERRIDE;
35 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 35 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
36 virtual PageTransition::Type GetPageTransition() const OVERRIDE; 36 virtual content::PageTransition GetPageTransition() const OVERRIDE;
37 virtual void AcceptInput() OVERRIDE {} 37 virtual void AcceptInput() OVERRIDE {}
38 virtual void FocusLocation(bool select_all) OVERRIDE {} 38 virtual void FocusLocation(bool select_all) OVERRIDE {}
39 virtual void FocusSearch() OVERRIDE {} 39 virtual void FocusSearch() OVERRIDE {}
40 virtual void UpdateContentSettingsIcons() OVERRIDE {} 40 virtual void UpdateContentSettingsIcons() OVERRIDE {}
41 virtual void UpdatePageActions() OVERRIDE {} 41 virtual void UpdatePageActions() OVERRIDE {}
42 virtual void InvalidatePageActions() OVERRIDE {} 42 virtual void InvalidatePageActions() OVERRIDE {}
43 virtual void SaveStateToContents(TabContents* contents) OVERRIDE {} 43 virtual void SaveStateToContents(TabContents* contents) OVERRIDE {}
44 virtual void Revert() OVERRIDE {} 44 virtual void Revert() OVERRIDE {}
45 virtual const OmniboxView* location_entry() const OVERRIDE; 45 virtual const OmniboxView* location_entry() const OVERRIDE;
46 virtual OmniboxView* location_entry() OVERRIDE; 46 virtual OmniboxView* location_entry() OVERRIDE;
47 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 47 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
48 48
49 private: 49 private:
50 50
51 // Test-supplied values that will be returned through the LocationBar 51 // Test-supplied values that will be returned through the LocationBar
52 // interface. 52 // interface.
53 string16 input_string_; 53 string16 input_string_;
54 WindowOpenDisposition disposition_; 54 WindowOpenDisposition disposition_;
55 PageTransition::Type transition_; 55 content::PageTransition transition_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(TestLocationBar); 57 DISALLOW_COPY_AND_ASSIGN(TestLocationBar);
58 }; 58 };
59 59
60 60
61 #endif // CHROME_TEST_BASE_TEST_LOCATION_BAR_H_ 61 #endif // CHROME_TEST_BASE_TEST_LOCATION_BAR_H_
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/test_location_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698