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

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

Issue 768413003: TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 5 years, 11 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"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 LocationBarView* owner, 85 LocationBarView* owner,
86 ExtensionAction* action) override; 86 ExtensionAction* action) override;
87 virtual ContentSettingBubbleModelDelegate* 87 virtual ContentSettingBubbleModelDelegate*
88 GetContentSettingBubbleModelDelegate() override; 88 GetContentSettingBubbleModelDelegate() override;
89 virtual void ShowWebsiteSettings(content::WebContents* web_contents, 89 virtual void ShowWebsiteSettings(content::WebContents* web_contents,
90 const GURL& url, 90 const GURL& url,
91 const content::SSLStatus& ssl) override; 91 const content::SSLStatus& ssl) override;
92 92
93 // Implements ToolbarModelDelegate: 93 // Implements ToolbarModelDelegate:
94 virtual content::WebContents* GetActiveWebContents() const override; 94 virtual content::WebContents* GetActiveWebContents() const override;
95 virtual bool InTabbedBrowser() const override;
96 95
97 // Implements CommandUpdaterDelegate: 96 // Implements CommandUpdaterDelegate:
98 virtual void ExecuteCommandWithDisposition( 97 virtual void ExecuteCommandWithDisposition(
99 int id, 98 int id,
100 WindowOpenDisposition) override; 99 WindowOpenDisposition) override;
101 100
102 private: 101 private:
103 friend class SimpleWebViewDialogTest; 102 friend class SimpleWebViewDialogTest;
104 103
105 void LoadImages(); 104 void LoadImages();
(...skipping 15 matching lines...) Expand all
121 scoped_ptr<views::WebView> web_view_container_; 120 scoped_ptr<views::WebView> web_view_container_;
122 121
123 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_; 122 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_;
124 123
125 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog); 124 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog);
126 }; 125 };
127 126
128 } // namespace chromeos 127 } // namespace chromeos
129 128
130 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_ 129 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/ui/simple_web_view_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698