OLD | NEW |
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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
10 #include "base/json/json_file_value_serializer.h" | 10 #include "base/json/json_file_value_serializer.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 gfx::Rect bounds = browser()->window()->GetBounds(); | 47 gfx::Rect bounds = browser()->window()->GetBounds(); |
48 gfx::Rect expected_bounds(gfx::Rect(20, 30, 400, 500)); | 48 gfx::Rect expected_bounds(gfx::Rect(20, 30, 400, 500)); |
49 ASSERT_EQ(expected_bounds.ToString(), bounds.ToString()); | 49 ASSERT_EQ(expected_bounds.ToString(), bounds.ToString()); |
50 } | 50 } |
51 | 51 |
52 class PreferenceServiceTest : public InProcessBrowserTest { | 52 class PreferenceServiceTest : public InProcessBrowserTest { |
53 public: | 53 public: |
54 explicit PreferenceServiceTest(bool new_profile) : new_profile_(new_profile) { | 54 explicit PreferenceServiceTest(bool new_profile) : new_profile_(new_profile) { |
55 } | 55 } |
56 | 56 |
57 virtual bool SetUpUserDataDirectory() OVERRIDE { | 57 virtual bool SetUpUserDataDirectory() override { |
58 base::FilePath user_data_directory; | 58 base::FilePath user_data_directory; |
59 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); | 59 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); |
60 | 60 |
61 if (new_profile_) { | 61 if (new_profile_) { |
62 original_pref_file_ = ui_test_utils::GetTestFilePath( | 62 original_pref_file_ = ui_test_utils::GetTestFilePath( |
63 base::FilePath().AppendASCII("profiles"). | 63 base::FilePath().AppendASCII("profiles"). |
64 AppendASCII("window_placement"). | 64 AppendASCII("window_placement"). |
65 AppendASCII("Default"), | 65 AppendASCII("Default"), |
66 base::FilePath().Append(chrome::kPreferencesFilename)); | 66 base::FilePath().Append(chrome::kPreferencesFilename)); |
67 tmp_pref_file_ = | 67 tmp_pref_file_ = |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 EXPECT_EQ(right, bounds.x() + bounds.width()); | 220 EXPECT_EQ(right, bounds.x() + bounds.width()); |
221 | 221 |
222 // Find if launched window is maximized. | 222 // Find if launched window is maximized. |
223 bool is_window_maximized = browser()->window()->IsMaximized(); | 223 bool is_window_maximized = browser()->window()->IsMaximized(); |
224 bool is_maximized = false; | 224 bool is_maximized = false; |
225 EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized", | 225 EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized", |
226 &is_maximized)); | 226 &is_maximized)); |
227 EXPECT_EQ(is_maximized, is_window_maximized); | 227 EXPECT_EQ(is_maximized, is_window_maximized); |
228 } | 228 } |
229 #endif | 229 #endif |
OLD | NEW |