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

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

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge Created 5 years, 10 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 LocationBarView* owner, 82 LocationBarView* owner,
83 ExtensionAction* action) override; 83 ExtensionAction* action) override;
84 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate() 84 ContentSettingBubbleModelDelegate* GetContentSettingBubbleModelDelegate()
85 override; 85 override;
86 void ShowWebsiteSettings(content::WebContents* web_contents, 86 void ShowWebsiteSettings(content::WebContents* web_contents,
87 const GURL& url, 87 const GURL& url,
88 const content::SSLStatus& ssl) override; 88 const content::SSLStatus& ssl) override;
89 89
90 // Implements ToolbarModelDelegate: 90 // Implements ToolbarModelDelegate:
91 content::WebContents* GetActiveWebContents() const override; 91 content::WebContents* GetActiveWebContents() const override;
92 bool InTabbedBrowser() const override;
93 92
94 // Implements CommandUpdaterDelegate: 93 // Implements CommandUpdaterDelegate:
95 void ExecuteCommandWithDisposition(int id, WindowOpenDisposition) override; 94 void ExecuteCommandWithDisposition(int id, WindowOpenDisposition) override;
96 95
97 private: 96 private:
98 friend class SimpleWebViewDialogTest; 97 friend class SimpleWebViewDialogTest;
99 98
100 void LoadImages(); 99 void LoadImages();
101 void UpdateButtons(); 100 void UpdateButtons();
102 void UpdateReload(bool is_loading, bool force); 101 void UpdateReload(bool is_loading, bool force);
(...skipping 13 matching lines...) Expand all
116 scoped_ptr<views::WebView> web_view_container_; 115 scoped_ptr<views::WebView> web_view_container_;
117 116
118 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_; 117 scoped_ptr<StubBubbleModelDelegate> bubble_model_delegate_;
119 118
120 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog); 119 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialog);
121 }; 120 };
122 121
123 } // namespace chromeos 122 } // namespace chromeos
124 123
125 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_UI_SIMPLE_WEB_VIEW_DIALOG_H_ 124 #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