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: content/browser/web_contents/web_contents_view_mus.h

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 28 matching lines...) Expand all
39 39
40 WebContents* web_contents(); 40 WebContents* web_contents();
41 41
42 private: 42 private:
43 void SizeChangedCommon(const gfx::Size& size); 43 void SizeChangedCommon(const gfx::Size& size);
44 44
45 // WebContentsView implementation: 45 // WebContentsView implementation:
46 gfx::NativeView GetNativeView() const override; 46 gfx::NativeView GetNativeView() const override;
47 gfx::NativeView GetContentNativeView() const override; 47 gfx::NativeView GetContentNativeView() const override;
48 gfx::NativeWindow GetTopLevelNativeWindow() const override; 48 gfx::NativeWindow GetTopLevelNativeWindow() const override;
49 void GetScreenInfo(blink::WebScreenInfo* web_screen_info) const override; 49 void GetScreenInfo(ScreenInfo* screen_info) const override;
50 void GetContainerBounds(gfx::Rect* out) const override; 50 void GetContainerBounds(gfx::Rect* out) const override;
51 void SizeContents(const gfx::Size& size) override; 51 void SizeContents(const gfx::Size& size) override;
52 void Focus() override; 52 void Focus() override;
53 void SetInitialFocus() override; 53 void SetInitialFocus() override;
54 void StoreFocus() override; 54 void StoreFocus() override;
55 void RestoreFocus() override; 55 void RestoreFocus() override;
56 DropData* GetDropData() const override; 56 DropData* GetDropData() const override;
57 gfx::Rect GetViewBounds() const override; 57 gfx::Rect GetViewBounds() const override;
58 void CreateView(const gfx::Size& initial_size, 58 void CreateView(const gfx::Size& initial_size,
59 gfx::NativeView context) override; 59 gfx::NativeView context) override;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 std::unique_ptr<WebContentsViewDelegate> delegate_; 111 std::unique_ptr<WebContentsViewDelegate> delegate_;
112 std::unique_ptr<aura::Window> aura_window_; 112 std::unique_ptr<aura::Window> aura_window_;
113 std::unique_ptr<ui::ScopedWindowPtr> mus_window_; 113 std::unique_ptr<ui::ScopedWindowPtr> mus_window_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus); 115 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus);
116 }; 116 };
117 117
118 } // namespace content 118 } // namespace content
119 119
120 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_ 120 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698