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

Side by Side Diff: chrome/browser/chromeos/login/ui/simple_web_view_dialog.h

Issue 1314953009: Refactor WebsiteSettings to operate on a SecurityInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_
7 7
8 #include <string> 8 #include <string>
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/command_updater_delegate.h" 10 #include "chrome/browser/command_updater_delegate.h"
11 #include "chrome/browser/ssl/security_state_model.h"
11 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" 12 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
12 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 13 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
13 #include "content/public/browser/page_navigator.h" 14 #include "content/public/browser/page_navigator.h"
14 #include "content/public/browser/web_contents_delegate.h" 15 #include "content/public/browser/web_contents_delegate.h"
15 #include "ui/views/controls/button/image_button.h" 16 #include "ui/views/controls/button/image_button.h"
16 #include "ui/views/widget/widget_delegate.h" 17 #include "ui/views/widget/widget_delegate.h"
17 #include "url/gurl.h" 18 #include "url/gurl.h"
18 19
19 class CommandUpdater; 20 class CommandUpdater;
20 class Profile; 21 class Profile;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 content::WebContents* GetWebContents() override; 76 content::WebContents* GetWebContents() override;
76 ToolbarModel* GetToolbarModel() override; 77 ToolbarModel* GetToolbarModel() override;
77 const ToolbarModel* GetToolbarModel() const override; 78 const ToolbarModel* GetToolbarModel() const override;
78 views::Widget* CreateViewsBubble( 79 views::Widget* CreateViewsBubble(
79 views::BubbleDelegateView* bubble_delegate) override; 80 views::BubbleDelegateView* bubble_delegate) override;
80 PageActionImageView* CreatePageActionImageView( 81 PageActionImageView* CreatePageActionImageView(
81 LocationBarView* owner, 82 LocationBarView* owner,
82 ExtensionAction* action) override; 83 ExtensionAction* action) override;
83 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate() 84 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate()
84 override; 85 override;
85 void ShowWebsiteSettings(content::WebContents* web_contents, 86 void ShowWebsiteSettings(
86 const GURL& url, 87 content::WebContents* web_contents,
87 const content::SSLStatus& ssl) override; 88 const GURL& url,
89 const SecurityStateModel::SecurityInfo& security_info) override;
88 90
89 // Implements ToolbarModelDelegate: 91 // Implements ToolbarModelDelegate:
90 content::WebContents* GetActiveWebContents() const override; 92 content::WebContents* GetActiveWebContents() const override;
91 93
92 // Implements CommandUpdaterDelegate: 94 // Implements CommandUpdaterDelegate:
93 void ExecuteCommandWithDisposition(int id, WindowOpenDisposition) override; 95 void ExecuteCommandWithDisposition(int id, WindowOpenDisposition) override;
94 96
95 private: 97 private:
96 friend class SimpleWebViewDialogTest; 98 friend class SimpleWebViewDialogTest;
97 99
(...skipping 16 matching lines...) Expand all
114 scoped_ptr<views::WebView> web_view_container_; 116 scoped_ptr<views::WebView> web_view_container_;
115 117
116 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_; 118 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_;
117 119
118 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog); 120 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog);
119 }; 121 };
120 122
121 } // namespace chromeos 123 } // namespace chromeos
122 124
123 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_ 125 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698