summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/status
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 20:45:17 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-10 20:45:17 +0000
commit57e6f8f36cd84ef04b2e0ce417fa455715f121ff (patch)
tree7790351a070232692213e4e8870b46074686b5fd /chrome/browser/chromeos/status
parent810f807eb6136de803bd7204d50b34f271f171d9 (diff)
downloadchromium_src-57e6f8f36cd84ef04b2e0ce417fa455715f121ff.zip
chromium_src-57e6f8f36cd84ef04b2e0ce417fa455715f121ff.tar.gz
chromium_src-57e6f8f36cd84ef04b2e0ce417fa455715f121ff.tar.bz2
Cleanup: Remove needed #includes for profile.h.
BUG=none TEST=none Review URL: http://codereview.chromium.org/5682007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status')
-rw-r--r--chrome/browser/chromeos/status/clock_menu_button.cc3
-rw-r--r--chrome/browser/chromeos/status/clock_menu_button_browsertest.cc2
-rw-r--r--chrome/browser/chromeos/status/input_method_menu.cc2
3 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc
index 4d8a9fb..3551083 100644
--- a/chrome/browser/chromeos/status/clock_menu_button.cc
+++ b/chrome/browser/chromeos/status/clock_menu_button.cc
@@ -12,7 +12,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/status/status_area_host.h"
-#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/pref_names.h"
#include "gfx/canvas.h"
@@ -41,7 +40,7 @@ ClockMenuButton::ClockMenuButton(StatusAreaHost* host)
set_use_menu_button_paint(true);
SetFont(ResourceBundle::GetSharedInstance().GetFont(
ResourceBundle::BaseFont).DeriveFont(kFontSizeDelta));
- SetEnabledColor(0xB3FFFFFF); // White with 70% Alpha
+ SetEnabledColor(0xB3FFFFFF); // White with 70% Alpha
SetShowMultipleIconStates(false);
set_alignment(TextButton::ALIGN_CENTER);
UpdateTextAndSetNextTimer();
diff --git a/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc b/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc
index 5e3ed6d..9f934d6 100644
--- a/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/chromeos/status/status_area_view.h"
#include "chrome/browser/chromeos/view_ids.h"
#include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/pref_names.h"
@@ -51,7 +50,6 @@ IN_PROC_BROWSER_TEST_F(ClockMenuButtonTest, TimezoneTest) {
CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone_second.get());
std::wstring text_after = clock->text();
EXPECT_NE(text_before, text_after);
-
}
} // namespace chromeos
diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc
index bd12e91..83082d3 100644
--- a/chrome/browser/chromeos/status/input_method_menu.cc
+++ b/chrome/browser/chromeos/status/input_method_menu.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/chromeos/status/input_method_menu.h"
#include <string>
+#include <vector>
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
@@ -19,7 +20,6 @@
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"