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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/views/frame/browser_non_client_frame_view_ash.h" 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
6 6
7 #include "ash/ash_switches.h"
8 #include "ash/common/ash_constants.h" 7 #include "ash/common/ash_constants.h"
8 #include "ash/common/ash_switches.h"
9 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 9 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
10 #include "ash/frame/header_painter.h" 10 #include "ash/frame/header_painter.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 12 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_commands.h" 16 #include "chrome/browser/ui/browser_commands.h"
17 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 17 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
18 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" 18 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 const gfx::Rect during_maximize = frame_view->caption_button_container_-> 292 const gfx::Rect during_maximize = frame_view->caption_button_container_->
293 bounds(); 293 bounds();
294 EXPECT_GT(initial.width(), during_maximize.width()); 294 EXPECT_GT(initial.width(), during_maximize.width());
295 ash::Shell::GetInstance()->maximize_mode_controller()-> 295 ash::Shell::GetInstance()->maximize_mode_controller()->
296 EnableMaximizeModeWindowManager(false); 296 EnableMaximizeModeWindowManager(false);
297 test.EndAnimations(); 297 test.EndAnimations();
298 const gfx::Rect after_restore = frame_view->caption_button_container_-> 298 const gfx::Rect after_restore = frame_view->caption_button_container_->
299 bounds(); 299 bounds();
300 EXPECT_EQ(initial, after_restore); 300 EXPECT_EQ(initial, after_restore);
301 } 301 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698