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

Unified Diff: chrome/browser/extensions/api/sessions/sessions_api.cc

Issue 1015123003: Extension window.create API accepts state. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/sessions/sessions_api.cc
diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc
index 0aaecb5b71e27777e104719ec2f25e99a1e6f421..498cb9c0158d757b3a1871dc76ee9d29f93396f2 100644
--- a/chrome/browser/extensions/api/sessions/sessions_api.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_api.cc
@@ -109,10 +109,10 @@ scoped_ptr<tabs::Tab> CreateTabModelHelper(
}
scoped_ptr<windows::Window> CreateWindowModelHelper(
- scoped_ptr<std::vector<linked_ptr<tabs::Tab> > > tabs,
+ scoped_ptr<std::vector<linked_ptr<tabs::Tab>>> tabs,
const std::string& session_id,
const windows::Window::Type& type,
- const windows::Window::State& state) {
+ const windows::State& state) {
scoped_ptr<windows::Window> window_struct(new windows::Window);
window_struct->tabs = tabs.Pass();
window_struct->session_id.reset(new std::string(session_id));
@@ -172,10 +172,9 @@ scoped_ptr<windows::Window>
window.selected_tab_index).release()));
}
- return CreateWindowModelHelper(tabs.Pass(),
- base::IntToString(session_id),
+ return CreateWindowModelHelper(tabs.Pass(), base::IntToString(session_id),
windows::Window::TYPE_NORMAL,
- windows::Window::STATE_NORMAL);
+ windows::STATE_NORMAL);
}
scoped_ptr<api::sessions::Session>
@@ -298,19 +297,19 @@ scoped_ptr<windows::Window> SessionsGetDevicesFunction::CreateWindowModel(
break;
}
- windows::Window::State state = windows::Window::STATE_NONE;
+ windows::State state = windows::STATE_NONE;
switch (window.show_state) {
case ui::SHOW_STATE_NORMAL:
- state = windows::Window::STATE_NORMAL;
+ state = windows::STATE_NORMAL;
break;
case ui::SHOW_STATE_MINIMIZED:
- state = windows::Window::STATE_MINIMIZED;
+ state = windows::STATE_MINIMIZED;
break;
case ui::SHOW_STATE_MAXIMIZED:
- state = windows::Window::STATE_MAXIMIZED;
+ state = windows::STATE_MAXIMIZED;
break;
case ui::SHOW_STATE_FULLSCREEN:
- state = windows::Window::STATE_FULLSCREEN;
+ state = windows::STATE_FULLSCREEN;
break;
case ui::SHOW_STATE_DEFAULT:
case ui::SHOW_STATE_INACTIVE:
« no previous file with comments | « no previous file | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | chrome/browser/extensions/api/tabs/tabs_api.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698