summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 01:42:26 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 01:42:26 +0000
commit7c30b3f800da22355f1adf19bcd662a0aeeeeb65 (patch)
treea06bfe3b36785021b57d8594d356c86bc6ca2f29
parenteb08d1f994f8ddc3849f02469a5f40e6c2f6ba30 (diff)
downloadchromium_src-7c30b3f800da22355f1adf19bcd662a0aeeeeb65.zip
chromium_src-7c30b3f800da22355f1adf19bcd662a0aeeeeb65.tar.gz
chromium_src-7c30b3f800da22355f1adf19bcd662a0aeeeeb65.tar.bz2
Revert 37924 - Final fix. Scope was wrong. TBR=oshima
Review URL: http://codereview.chromium.org/561038 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/563015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37925 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/browser_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/browser_view.cc b/chrome/browser/chromeos/browser_view.cc
index dbe486b..0e5798e 100644
--- a/chrome/browser/chromeos/browser_view.cc
+++ b/chrome/browser/chromeos/browser_view.cc
@@ -116,7 +116,7 @@ namespace chromeos {
// main menu, stataus views.
class BrowserViewLayout : public ::BrowserViewLayout {
public:
- BrowserViewLayout() : ::BrowserViewLayout() {}
+ BrowserViewLayout() : BrowserViewLayout() {}
virtual ~BrowserViewLayout() {}
//////////////////////////////////////////////////////////////////////////////
@@ -317,7 +317,7 @@ class BrowserViewLayout : public ::BrowserViewLayout {
};
BrowserView::BrowserView(Browser* browser)
- : ::BrowserView(browser),
+ : BrowserView(browser),
main_menu_(NULL),
status_area_(NULL),
compact_navigation_bar_(NULL),