chrome: Move browser_otr_state.h into chrome namespace.
BUG=133088
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10831084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149364 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 953f39b..41723aa 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -1864,7 +1864,7 @@
// We simply don't log anything to UMA if there is a single incognito
// session visible. The problem is that we always notify using the orginal
// profile in order to simplify notification processing.
- return !browser::IsOffTheRecordSessionActive();
+ return !chrome::IsOffTheRecordSessionActive();
}
void MetricsService::RecordBooleanPrefValue(const char* path, bool value) {
diff --git a/chrome/browser/ui/browser_otr_state.cc b/chrome/browser/ui/browser_otr_state.cc
index c1035f6..cacf406f 100644
--- a/chrome/browser/ui/browser_otr_state.cc
+++ b/chrome/browser/ui/browser_otr_state.cc
@@ -6,10 +6,10 @@
#include "chrome/browser/ui/browser_list.h"
-namespace browser {
+namespace chrome {
bool IsOffTheRecordSessionActive() {
return BrowserList::IsOffTheRecordSessionActive();
}
-}
+} // namespace chrome
diff --git a/chrome/browser/ui/browser_otr_state.h b/chrome/browser/ui/browser_otr_state.h
index 555068e..927f720 100644
--- a/chrome/browser/ui/browser_otr_state.h
+++ b/chrome/browser/ui/browser_otr_state.h
@@ -5,10 +5,10 @@
#ifndef CHROME_BROWSER_UI_BROWSER_OTR_STATE_H_
#define CHROME_BROWSER_UI_BROWSER_OTR_STATE_H_
-namespace browser {
+namespace chrome {
bool IsOffTheRecordSessionActive();
-}
+} // namespace chrome
#endif // CHROME_BROWSER_UI_BROWSER_OTR_STATE_H_
diff --git a/chrome/browser/ui/browser_otr_state_android.cc b/chrome/browser/ui/browser_otr_state_android.cc
index 34dbcca..1fc7369 100644
--- a/chrome/browser/ui/browser_otr_state_android.cc
+++ b/chrome/browser/ui/browser_otr_state_android.cc
@@ -6,10 +6,10 @@
#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
-namespace browser {
+namespace chrome {
bool IsOffTheRecordSessionActive() {
return TabModelList::IsOffTheRecordSessionActive();
}
-}
+} // namespace chrome
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 12dd4ca..0419165 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -628,7 +628,7 @@
return native_widget_->IsAccessibleWidget();
}
-ThemeProvider* Widget::GetThemeProvider() const {
+ui::ThemeProvider* Widget::GetThemeProvider() const {
const Widget* root_widget = GetTopLevelWidget();
if (root_widget && root_widget != this) {
// Attempt to get the theme provider, and fall back to the default theme
