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

Side by Side Diff: chrome/browser/ui/browser_command_controller.cc

Issue 525793002: Make WebContentsObserver::web_contents() public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 #include "chrome/browser/ui/browser_command_controller.h" 5 #include "chrome/browser/ui/browser_command_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 837
838 class BrowserCommandController::InterstitialObserver 838 class BrowserCommandController::InterstitialObserver
839 : public content::WebContentsObserver { 839 : public content::WebContentsObserver {
840 public: 840 public:
841 InterstitialObserver(BrowserCommandController* controller, 841 InterstitialObserver(BrowserCommandController* controller,
842 content::WebContents* web_contents) 842 content::WebContents* web_contents)
843 : WebContentsObserver(web_contents), 843 : WebContentsObserver(web_contents),
844 controller_(controller) { 844 controller_(controller) {
845 } 845 }
846 846
847 using content::WebContentsObserver::web_contents;
848
849 virtual void DidAttachInterstitialPage() OVERRIDE { 847 virtual void DidAttachInterstitialPage() OVERRIDE {
850 controller_->UpdateCommandsForTabState(); 848 controller_->UpdateCommandsForTabState();
851 } 849 }
852 850
853 virtual void DidDetachInterstitialPage() OVERRIDE { 851 virtual void DidDetachInterstitialPage() OVERRIDE {
854 controller_->UpdateCommandsForTabState(); 852 controller_->UpdateCommandsForTabState();
855 } 853 }
856 854
857 private: 855 private:
858 BrowserCommandController* controller_; 856 BrowserCommandController* controller_;
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1354 1352
1355 BrowserWindow* BrowserCommandController::window() { 1353 BrowserWindow* BrowserCommandController::window() {
1356 return browser_->window(); 1354 return browser_->window();
1357 } 1355 }
1358 1356
1359 Profile* BrowserCommandController::profile() { 1357 Profile* BrowserCommandController::profile() {
1360 return browser_->profile(); 1358 return browser_->profile();
1361 } 1359 }
1362 1360
1363 } // namespace chrome 1361 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698